diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-16 11:46:47 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-16 11:46:47 +0300 |
| commit | db96d5853e7d55f1d469d51a93ab38ce3bd72daa (patch) | |
| tree | 61a2bf90be9e17932e3dedb618ed62fb8fcee56c /fs/proc/stat.c | |
| parent | 51ce5f332940ea114426db57772fe0ed18cc2790 (diff) | |
| parent | 7119dbdf7c52042acb1b02f116fa3257e97659ea (diff) | |
| download | linux-db96d5853e7d55f1d469d51a93ab38ce3bd72daa.tar.xz | |
Merge tag 'drm-fixes-for-v4.12-rc6' of git://people.freedesktop.org/~airlied/linux
Pull drm fixes from Dave Airlie:
"This is the main fixes pull for 4.12-rc6, all pretty normal for this
stage, nothing really stands out. The mxsfb one is probably the
largest and it's for a black screen boot problem.
AMD, i915, mgag200, msxfb, tegra fixes"
* tag 'drm-fixes-for-v4.12-rc6' of git://people.freedesktop.org/~airlied/linux:
drm: mxsfb_crtc: Reset the eLCDIF controller
drm/mgag200: Fix to always set HiPri for G200e4 V2
drm/tegra: Correct idr_alloc() minimum id
drm/tegra: Fix lockup on a use of staging API
gpu: host1x: Fix error handling
drm/radeon: Fix overflow of watermark calcs at > 4k resolutions.
drm/amdgpu: Fix overflow of watermark calcs at > 4k resolutions.
drm/radeon: fix "force the UVD DPB into VRAM as well"
drm/i915: Fix GVT-g PVINFO version compatibility check
drm/i915: Fix SKL+ watermarks for 90/270 rotation
drm/i915: Fix scaling check for 90/270 degree plane rotation
drm: dw-hdmi: Fix compilation breakage by selecting REGMAP_MMIO
Diffstat (limited to 'fs/proc/stat.c')
0 files changed, 0 insertions, 0 deletions