Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 18 Jan 2006 23:08:02 +0000 (15:08 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 18 Jan 2006 23:08:02 +0000 (15:08 -0800)
1  2 
arch/sparc64/defconfig

Simple merge