Merge bk://kernel.bkbits.net/davem/sparc-2.6
commit1f7abe86ce081437353b6f765e82f2eed1337427
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 4 Apr 2005 00:50:59 +0000 (3 17:50 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 4 Apr 2005 00:50:59 +0000 (3 17:50 -0700)
treed25109e97a571e97db814c8af42e07a789702e1f
parent10752217624970d25d2244bf9141c240be19ebd9
parent31218ffa5c408e13a209fb6c131e417a8805e579
Merge bk://kernel.bkbits.net/davem/sparc-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux