Merge head 'drm-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 9 Jul 2005 16:59:23 +0000 (09:59 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 9 Jul 2005 16:59:23 +0000 (09:59 -0700)
commit0109fd37046de64e8459f8c4f4706df9ac7cc82c
tree18dcdb43cc8c6cd494375f8af919024889d24d87
parentcc14cf46da215a9df1c0a4388763a68769ef9e53
parent850eb83a6a21b086624b227653ce90ad927ba423
Merge head 'drm-fixes' of /linux/kernel/git/airlied/drm-2.6
drivers/char/drm/i915_drv.c
drivers/char/drm/i915_drv.h