linux/drivers/gpu
Colin Cross 633c6f1b21 Merge commit 'v3.4.5' into android-3.4
Conflicts:
	drivers/base/power/main.c

Change-Id: I0c7d106d2de75d0e40f167245ad4cc37e1556bb0
2012-07-16 15:25:51 -07:00
..
drm drm/i915: rip out the PM_IIR WARN 2012-07-16 09:04:43 -07:00
ion gpu: ion: Add explicit sync ioctl 2012-06-26 23:02:09 -07:00
stub i915: select VIDEO_OUTPUT_CONTROL for ACPI_VIDEO 2011-04-13 09:10:25 +10:00
vga drivers/gpu/vga/vgaarb.c: add missing kfree 2011-11-22 20:21:10 +00:00
Makefile gpu: ion: Add ION Memory Manager 2012-04-09 13:57:56 -07:00