Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 15 Oct 2005 00:17:04 +0000 (17:17 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 15 Oct 2005 00:17:04 +0000 (17:17 -0700)
commitf8cc5756dee3c2a4c56a7f089291f5ae0232747f
treec56914922a40cca1a48ac0191f2f5d7fb224ad55
parentbf7c7decb9752a3cb644b435cb354c8948606680
parentb4d1b825785847cddee6d104113da913f2ca8efb
Merge /pub/scm/linux/kernel/git/davem/sparc-2.6