Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 8 Oct 2005 21:57:20 +0000 (14:57 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 8 Oct 2005 21:57:20 +0000 (14:57 -0700)
commit582fd487611baa06b07665978429192390c29b8f
tree05625e483cc3ebf0de1a2df8dfd57bbb5a208c28
parent7ab501db8cb6659efdf04034e0de6b44c059a51b
parentba6399334dd8a75bd295de26496196c720abae0a
Merge /pub/scm/linux/kernel/git/davem/sparc-2.6