Chris Wilson 5aa7d52aeb Merge branch 'drm-intel-fixes' into drm-intel-next ... Immediate merge for the conflicting introduction of HAS_COHERENT_RINGS. Conflicts: drivers/gpu/drm/i915/i915_dma.c include/drm/i915_drm.h		2010-12-05 10:43:39 +00:00
..
drm	Merge branch 'drm-intel-fixes' into drm-intel-next	2010-12-05 10:43:39 +00:00
stub	drm/stub/Kconfig: fix Kconfig for stub driver.	2010-11-09 13:33:00 +10:00
vga	Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl	2010-10-22 10:52:56 -07:00
Makefile	gpu: Add Intel GMA500(Poulsbo) Stub Driver	2010-10-26 11:00:13 +10:00