Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 22 Feb 2006 23:23:05 +0000 (15:23 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 22 Feb 2006 23:23:05 +0000 (15:23 -0800)
commit9e956c2dac9bec602ed1ba29181b45ba6d2b6448
treee5c715e51dd56b199d542852ca2b60f76d32ddc2
parent1a6a35894f10870d5590199d1785d3a718927abe
parenta6ceda7457b2303dcb07d3c472b25d52bbdb5a29
Merge /pub/scm/linux/kernel/git/davem/sparc-2.6