Dave Airlie 017ed8012e Merge tag 'v3.1-rc10' into drm-core-next ... There are a number of fixes in mainline required for code in -next, also there was a few conflicts I'd rather resolve myself. Signed-off-by: Dave Airlie <airlied@redhat.com> Conflicts: drivers/gpu/drm/radeon/evergreen.c drivers/gpu/drm/radeon/r600.c drivers/gpu/drm/radeon/radeon_asic.h		2011-10-18 10:54:30 +01:00
..
drm	Merge tag 'v3.1-rc10' into drm-core-next	2011-10-18 10:54:30 +01:00
stub	i915: select VIDEO_OUTPUT_CONTROL for ACPI_VIDEO	2011-04-13 09:10:25 +10:00
vga	drivers: use kzalloc/kcalloc instead of 'kmalloc+memset', where possible	2011-07-25 20:57:13 -07:00
Makefile