David S. Miller e3c6d4ee54 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 ... Conflicts: arch/sparc64/kernel/idprom.c		2008-12-28 20:19:47 -08:00
..
boot	sparc,sparc64: unify boot/	2008-12-04 09:17:21 -08:00
configs	sparc,sparc64: unify Makefile	2008-12-04 09:17:16 -08:00
include/asm	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2008-12-28 20:19:47 -08:00
kernel	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2008-12-28 20:19:47 -08:00
lib	sparc: Commonize memcmp assembler.	2008-12-09 04:09:07 -08:00
math-emu	sparc64: unify math-emu	2008-12-04 09:16:56 -08:00
mm	sparc: drop SUN_IO	2008-12-27 00:55:45 -08:00
oprofile	sparc64: Provide oprofile pseudo-NMI on Niagara.	2008-12-04 09:17:10 -08:00
prom	sparc: Use sparc64 version of prom/printf.c	2008-12-08 01:00:14 -08:00
Kconfig	sparc: move select of ARCH_SUPPORTS_MSI	2008-12-27 00:56:29 -08:00
Kconfig.debug	sparc: unify Kconfig.debug	2008-12-04 09:16:48 -08:00
Makefile	sparc: unify kernel/init_task	2008-12-04 13:28:09 -08:00