Merge bk://kernel.bkbits.net/davem/sparc-2.5
commit5ade138f373b988a4eef0698b327a868a7c03b6e
authorLinus Torvalds <torvalds@home.osdl.org>
Fri, 25 Jul 2003 09:28:59 +0000 (25 02:28 -0700)
committerLinus Torvalds <torvalds@home.osdl.org>
Fri, 25 Jul 2003 09:28:59 +0000 (25 02:28 -0700)
treeae3f2414eaebce37b7f12383ddc4eee59a660381
parentbd519fce899009609df8a9c8f61294fb06cbaab4
parentc5a46f5160b2e71cf6ef8838d23806f18625bf02
Merge bk://kernel.bkbits.net/davem/sparc-2.5
into home.osdl.org:/home/torvalds/v2.5/linux