Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 27 Sep 2005 20:33:25 +0000 (13:33 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 27 Sep 2005 20:33:25 +0000 (13:33 -0700)
commit95001ee9256df846e374f116c92ca8e0beec1527
treeef682e01be51423592d19c5c9425363ef3881ca7
parent63906e41fe70fe8a376c5887429448272a0ee7d4
parent0dc461069879b45a2d5333bd16990f8080a318fd
Merge /pub/scm/linux/kernel/git/davem/sparc-2.6