Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 8 Feb 2006 04:34:29 +0000 (20:34 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 8 Feb 2006 04:34:29 +0000 (20:34 -0800)
commit746f956beb534ddf73da4346de81f2941c8573f8
tree5d47c5fa7645fd9f0dedcbfb997f8cbc6e074e72
parent367636e8a9ef250d5b255f9d299e1c27cb3d7ea3
parent0fc9b55606662c4763a4f37add889cfd6a66247a
Merge /pub/scm/linux/kernel/git/davem/sparc-2.6