Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 12 Jan 2006 01:06:31 +0000 (17:06 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 12 Jan 2006 01:06:31 +0000 (17:06 -0800)
commit99535ac2d4d95dbcad6b8d8a04ea57a891fb533b
tree6588fe50e22a2c4afe23b66b45b8e8374abe4e20
parent607f4e3864a4306be0d0ad11ff34284c239aad1b
parent61943c5015acae42fe355bf033bbee8d63691fe3
Merge /pub/scm/linux/kernel/git/davem/sparc-2.6