Linus Torvalds 7a1fcd5f51 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 ... * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: (30 commits) sparc: Fix minor SPARC32 compile error sparc: Remove reg*.h from Kbuild sparc: Clean arch-specific code in prom_common.c sparc: Kill asm/reg*.h sparc: Use 64BIT config entry MAINTAINERS: update sparc maintainer sparc: unify ipcbuf.h sparc: Update 64-bit defconfig. sparc: remove NO_PROC_ID - it is no longer used sparc: drop get_tbr() in traps.h sparc: fix warning in userspace header traps.h sparc: fix warnings in userspace header byteorder.h sparc: fix warning in userspace header jsflash.h sparc: unify openprom.h sparc64: delete unused linux_prom64_ranges from openprom_64.h sparc: prepare openprom for unification sparc: remove linux_prom_pci_assigned_addresses from openprom_32.h sparc: remove ebus definitions from openprom*.h sparc: unify siginfo.h sparc: unify ptrace.h ...		2009-01-05 18:45:06 -08:00
..
boot	sparc,sparc64: unify boot/	2008-12-04 09:17:21 -08:00
configs	sparc: Update 64-bit defconfig.	2009-01-02 21:54:25 -08:00
include/asm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6	2009-01-05 18:45:06 -08:00
kernel	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6	2009-01-05 18:45:06 -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: Use 64BIT config entry	2009-01-04 23:03:10 -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