Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Mon, 9 Jan 2006 23:10:22 +0000 (15:10 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 9 Jan 2006 23:10:22 +0000 (15:10 -0800)
commit2cc6055060d975e8c7601f4a1c68ef2d3050b4e9
treeb4881e2d9c38462e6633b30497823ba324396acd
parent3995f4c5327595b51482bdac8c189736262eb6e0
parent3ebc284d52757cf39788731f8fddd70a89f7fc23
Merge /pub/scm/linux/kernel/git/davem/sparc-2.6