Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 21 Dec 2005 01:33:54 +0000 (17:33 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 21 Dec 2005 01:33:54 +0000 (17:33 -0800)
commitb05948d9b7167e23af88cc65b9ffa4687eaf1f0d
tree12b7646800600b17cbe019fa3b452a57231f1594
parentfd30fc3256824f03c2ff9317269d66f72f7042ca
parenta9c9dff1bc64750c81ee99779164d304c35d2ff3
Merge /pub/scm/linux/kernel/git/davem/sparc-2.6