Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 18 Mar 2014 08:43:56 +0000 (09:43 +0100)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 18 Mar 2014 08:43:56 +0000 (09:43 +0100)
commite19b9137142988bec5a76c5f8bdf12a77ea802b0
treeb36c83fa93da7f18c1331252fb82a87431697443
parent2fae6a860ca9adb0c881f6dcd633df775c2520e9
parente40d641099213145a034981e646dc2180a488152
Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next

Conflicts:
drivers/gpu/drm/i915/Makefile

Makefile cleanup in drm-intel-next conflicts with a build-fix to move
intel_opregion under CONFIG_ACPI.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/Makefile
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_gem_gtt.c
drivers/gpu/drm/i915/i915_gpu_error.c
drivers/gpu/drm/i915/i915_irq.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_dp.c
drivers/gpu/drm/i915/intel_ringbuffer.c
drivers/gpu/drm/i915/intel_ringbuffer.h