Dave Airlie 38f1cff086 Merge commit '5359533801e3dd3abca5b7d3d985b0b33fd9fe8b' into drm-core-next ... This commit changed an internal radeon structure, that meant a new driver in -next had to be fixed up, merge in the commit and fix up the driver. Also fixes a trivial nouveau merge. Conflicts: drivers/gpu/drm/nouveau/nouveau_mem.c		2011-03-16 11:34:41 +10:00
..
drm	Merge commit '5359533801e3dd3abca5b7d3d985b0b33fd9fe8b' into drm-core-next	2011-03-16 11:34:41 +10:00
stub	gpu/stub: fix acpi_video build error, fix stub kconfig dependencies	2011-02-04 12:48:18 +10:00
vga	Merge remote branch 'linus/master' into drm-intel-fixes	2011-01-24 18:27:32 +00:00
Makefile	gpu: Add Intel GMA500(Poulsbo) Stub Driver	2010-10-26 11:00:13 +10:00