Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 20 Dec 2005 00:43:57 +0000 (16:43 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 20 Dec 2005 00:43:57 +0000 (16:43 -0800)
commit546ac8a63186a06e5d21778eefa4695232aee5b8
tree9af42a244753596cd30ac90473fe9f76ee7e9b7e
parentce7fa1b3f9105873f6e26edb7241c848cab70e4d
parentce37e5f90366cb90320a285edd2113fd807f3ab6
Merge /pub/scm/linux/kernel/git/davem/sparc-2.6