]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
Merge master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 4 Feb 2006 02:17:47 +0000 (18:17 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 4 Feb 2006 02:17:47 +0000 (18:17 -0800)

Trivial merge