Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 18 Nov 2005 01:26:56 +0000 (17:26 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 18 Nov 2005 01:26:56 +0000 (17:26 -0800)
commit811803c5572b296e0031e0099203de90d77c7bcf
treed2cd86c706af9e6ad47e2dda6b24df0d93f6f98f
parent42f9cabebe5915351bdba2f6f7f80e47c68e6ac8
parentd5ea655376c471731845735dfe9a0bdfbe4492e9
Merge /pub/scm/linux/kernel/git/davem/sparc-2.6