Daniel Vetter e19b913714 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>		2014-03-18 09:43:56 +01:00
..
drm	Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next	2014-03-18 09:43:56 +01:00
host1x	gpu: host1x: Remove unnecessary include	2014-01-14 14:39:45 +01:00
vga	vgaarb: Fix VGA decodes changes	2013-09-03 19:17:59 +02:00
Makefile