Dave Airlie 4cf73129cb Merge remote-tracking branch 'pfdo/drm-fixes' into drm-core-next ...

-next reported a messy merge, so I've merged my upstream pull into
my -next tree.

Conflicts:
	drivers/gpu/drm/vmwgfx/vmwgfx_kms.c

2011-12-21 09:50:56 +00:00

..

drm

Merge remote-tracking branch 'pfdo/drm-fixes' into drm-core-next

2011-12-21 09:50:56 +00: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

…