Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 30 Sep 2005 15:43:13 +0000 (08:43 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 30 Sep 2005 15:43:13 +0000 (08:43 -0700)
commitc4a7c77fcb8c0ef16e7193fb8cab2654282bbfab
treeca3a211950c7511609ba3f01ec11831d90882f22
parenta36f4961952214bdfc396e035a047268ac48c5c3
parent017fb98e70351e9fb5635c299c4d1c50e2f8b823
Merge /pub/scm/linux/kernel/git/davem/sparc-2.6