Merge head 'drm-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6
Linus Torvalds [Sat, 9 Jul 2005 16:59:23 +0000 (09:59 -0700)]
1  2 
drivers/char/drm/i915_drv.c
drivers/char/drm/i915_drv.h

Simple merge
Simple merge