Chris Wilson 8c1812ad48 Merge branch 'drm-intel-fixes' into drm-intel-next ...

Immediate merge to resolve conflicts from applying a stability fix to
both branches.

Conflicts:
	drivers/gpu/drm/i915/intel_ringbuffer.c
	drivers/gpu/drm/i915/intel_ringbuffer.h

2010-11-02 10:53:29 +00:00

..

drm

Merge branch 'drm-intel-fixes' into drm-intel-next

2010-11-02 10:53:29 +00:00

stub

gpu: Add Intel GMA500(Poulsbo) Stub Driver

2010-10-26 11:00:13 +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