Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 20 Jan 2006 06:17:38 +0000 (22:17 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 20 Jan 2006 06:17:38 +0000 (22:17 -0800)
commit02829f73774fa1f6c0a28f4018caaa7c94399c4a
treec6eeee5cda3a0516a63ccc5e08d5d3855b957122
parent497992917edf03994088ec8757b8262e1d9f568a
parent2d7d5f05111a9d913131a2764d8b20157f8f758d
Merge /pub/scm/linux/kernel/git/davem/sparc-2.6