Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 29 Nov 2005 22:23:38 +0000 (14:23 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 29 Nov 2005 22:23:38 +0000 (14:23 -0800)
commit2f12c74f0cfdc93e1d47ac70766e837ef29472fd
tree92e5c54b3f82254922f7f2ed6395e93d589356f5
parent92af254a1b7ea8c09ddff83887e5edc1342b37f8
parentcab3f16febeaf1a60e38159ff578f609f9976544
Merge /pub/scm/linux/kernel/git/davem/sparc-2.6