Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 8 Nov 2005 18:23:00 +0000 (10:23 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 8 Nov 2005 18:23:00 +0000 (10:23 -0800)
commita52e8381c430896d3bd6065a34fda99cb5c74c82
tree549c65dab5e5b2a0358ff45a3bcd37f2e37ffec4
parentbe9d122730c878baafe11e70d1436faac229f2fc
parentda1605465ebdb9dc25296a354394086cd559c243
Merge /pub/scm/linux/kernel/git/davem/sparc-2.6