Colin Cross f02fac6330 Merge commit 'v3.4-rc6' into android-3.4 ... Conflicts: arch/arm/mm/cache-l2x0.c arch/arm/mm/mmu.c Change-Id: If4f371a21c052fa597d107c44b128a093e4a8b91		2012-05-07 18:20:34 -07:00
..
drm	drm/radeon: clarify and extend wb setup on APUs and NI+ asics	2012-05-04 09:36:11 +01:00
ion	gpu: ion: ion_carveout_heap: fix for 3.4	2012-04-09 13:58:04 -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