Merge head 'drm-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6

author Linus Torvalds <torvalds@g5.osdl.org>

Sat, 9 Jul 2005 16:59:23 +0000 (09:59 -0700)

committer Linus Torvalds <torvalds@g5.osdl.org>

Sat, 9 Jul 2005 16:59:23 +0000 (09:59 -0700)
author Linus Torvalds <torvalds@g5.osdl.org>
Sat, 9 Jul 2005 16:59:23 +0000 (09:59 -0700)
committer Linus Torvalds <torvalds@g5.osdl.org>
Sat, 9 Jul 2005 16:59:23 +0000 (09:59 -0700)
diff --cc drivers/char/drm/i915_drv.c
Simple merge
diff --cc drivers/char/drm/i915_drv.h
Simple merge
author	Linus Torvalds <torvalds@g5.osdl.org>
	Sat, 9 Jul 2005 16:59:23 +0000 (09:59 -0700)
committer	Linus Torvalds <torvalds@g5.osdl.org>
	Sat, 9 Jul 2005 16:59:23 +0000 (09:59 -0700)
		1	2
drivers/char/drm/i915_drv.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/char/drm/i915_drv.h	patch \|	diff1 \|	diff2 \|	blob \| history