]> nv-tegra.nvidia Code Review - linux-3.10.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)
commitd8762748cae4f85b3201c0304969d993b42d5258
tree559819d9b17e5ee305d705cf9f31ac5de2aab54a
parentce4633704038f9bf39f20c10691747d6fc127bf4
parenta4e62fa031a9681477207b08391c3a5c5c831ce7
Merge /pub/scm/linux/kernel/git/airlied/drm-2.6

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