Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
commit0fb74dfb08b3d40e41ffdb6540078dcac433ac7a
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 15 Sep 2005 14:36:41 +0000 (15 07:36 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 15 Sep 2005 14:36:41 +0000 (15 07:36 -0700)
treee4bbd3246984cb7433c7c5d0bcca2e7769fc81a6
parent40796c5e8f2a93008e9034b3110a7e7b1fa0fba0
parent4db2ce0199f04b6e99999f22e28ef9a0ae5f0d2f
Merge /pub/scm/linux/kernel/git/davem/sparc-2.6