drivers/gpu/drm/i915/intel_ringbuffer.h · 8ad2bc9796994ecba9f4ba2fc9abca27ee9d193d · nexedi / linux

Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next · e19b9137

Daniel Vetter authored Mar 18, 2014

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>

e19b9137

intel_ringbuffer.h 9.07 KB

Replace intel_ringbuffer.h