]> git.baikalelectronics.ru Git - kernel.git/commit
Merge master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 2 Nov 2005 05:49:07 +0000 (21:49 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 2 Nov 2005 05:49:07 +0000 (21:49 -0800)
commit163483e483ead59f45a999d26789301da256640e
tree559819d9b17e5ee305d705cf9f31ac5de2aab54a
parentf181393ebc2a171db4b0a8f38d8bf4dd2eca1132
parenta61fc6e6a118c634810c5842a7272c2c4c954188
Merge master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6

Manual fixups for some clashes due to re-indenting.
drivers/char/drm/radeon_cp.c