Daniel Vetter 5d0cf3d6e0 Merge branch 'topic/soix' into drm-intel-next-queued ... Jesse's SOix work required some patches from acpi-next, so pull it in through a topic barnch. Conflicts: drivers/gpu/drm/i915/i915_drv.c drivers/gpu/drm/i915/intel_pm.c Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>		2014-06-18 11:44:05 +02:00
..
drm	Merge branch 'topic/soix' into drm-intel-next-queued	2014-06-18 11:44:05 +02:00
host1x	gpu: host1x: Rename internal functions for clarity	2014-06-05 23:10:30 +02:00
ipu-v3	gpu: ipu-v3: Register the CSI modules	2014-06-04 11:07:12 +02:00
vga	vgaswitcheroo: switch the mux to the igp on power down when runpm is enabled	2014-06-02 10:25:08 -04:00
Makefile	gpu: ipu-v3: Move i.MX IPUv3 core driver out of staging	2014-06-04 11:06:52 +02:00