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)
commit3da38566dfd4b2402b280cb52ffc7c56f1a95b9c
tree787bfa0d16f3d980db0de3853382279c3e117095
parent7c4d33675f81fa38f85eeabbbf3e7b8687c15cc3
parent959a85ada599fd5bab7fab8251795c3a58af28d4
Merge /pub/scm/linux/kernel/git/davem/sparc-2.6
arch/sparc64/defconfig