Backmerge drm-fixes merge into Linus's tree into drm-next.
authorDave Airlie <airlied@redhat.com>
Wed, 23 Dec 2015 22:08:47 +0000 (08:08 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 23 Dec 2015 22:08:47 +0000 (08:08 +1000)
commit20f8e032e6dc7053ab803f488e2a8839cd2f69a6
tree406b662934bffa205d90e9435bf96af7dc1a0cb0
parentade1ba7346070709856d7e38f8d1a77b7aa710aa
parent5b726e06d6e8309e5c9ef4109a32caf27c71dfc8
Backmerge drm-fixes merge into Linus's tree into drm-next.

This merges '5b726e06d6e8309e5c9ef4109a32caf27c71dfc8' into drm-next

Just to resolve some merges to make Daniel's life easier.

Signed-off-by: DAve Airlie <airlied@redhat.com>
13 files changed:
MAINTAINERS
drivers/gpu/drm/amd/amdgpu/amdgpu.h
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
drivers/gpu/drm/exynos/exynos_drm_crtc.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_hdmi.c
drivers/gpu/drm/i915/intel_pm.c
drivers/gpu/drm/radeon/cik.c
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c