Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
commitf44702f49056c203341badaa2cb8a706160d9119
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 8 Sep 2005 22:54:53 +0000 (8 15:54 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 8 Sep 2005 22:54:53 +0000 (8 15:54 -0700)
tree72e2c6521db08690165aa4167d7b74941d020b22
parent27e2df2228712af43e657b9768828448c64ba424
parent4d803fcdcd97dd346d4b39c3b76e5879cead8a31
Merge /pub/scm/linux/kernel/git/davem/sparc-2.6