Merge tag 'v3.14-rc7' into drm-next
authorDave Airlie <airlied@redhat.com>
Tue, 18 Mar 2014 09:12:31 +0000 (19:12 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 18 Mar 2014 09:12:31 +0000 (19:12 +1000)
commitbcc298bc924e0a990f853ba3e19f8b5a833cba7e
tree1c87c8f73dc41fd11ee3dacb1b91a7cc8b4798bb
parent978c6050165bba52eab7ef3581d447eb215def77
parentdcb99fd9b08cfe1afe426af4d8d3cbc429190f15
Merge tag 'v3.14-rc7' into drm-next

Linux 3.14-rc7

Backmerge to help out Intel guys.
18 files changed:
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_hdmi.c
drivers/gpu/drm/i915/intel_panel.c
drivers/gpu/drm/i915/intel_pm.c
drivers/gpu/drm/radeon/cik.c
drivers/gpu/drm/radeon/cik_sdma.c
drivers/gpu/drm/radeon/evergreen.c
drivers/gpu/drm/radeon/ni.c
drivers/gpu/drm/radeon/r100.c
drivers/gpu/drm/radeon/r300.c
drivers/gpu/drm/radeon/r600.c
drivers/gpu/drm/radeon/radeon.h
drivers/gpu/drm/radeon/radeon_device.c
drivers/gpu/drm/radeon/radeon_kms.c
drivers/gpu/drm/radeon/radeon_ttm.c
drivers/gpu/drm/radeon/radeon_uvd.c
drivers/gpu/drm/radeon/si.c