David S. Miller 8fe5f56c8a Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux ... Conflicts: arch/sparc/kernel/leon_smp.c Merge mainline to get the nobootmem.c bug fix, for the sake of the sparc64 NO_BOOTMEM conversion. Resolve a small include line conflict in leon_smp.c Signed-off-by: David S. Miller <davem@davemloft.net>		2012-04-26 20:00:35 -07:00
..
boot	Kbuild: centralize MKIMAGE and cmd_uimage definitions	2012-03-26 15:49:20 +02:00
configs	defconfig reduction	2010-08-14 22:26:53 +02:00
include/asm	sparc32: generic clockevent support	2012-04-15 10:28:50 -07:00
kernel	Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux	2012-04-26 20:00:35 -07:00
lib	lib: Fix multiple definitions of clz_tab	2012-02-02 10:34:23 +11:00
math-emu	Disintegrate asm/system.h for Sparc	2012-03-28 18:30:03 +01:00
mm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc	2012-04-13 13:32:07 -07:00
oprofile
prom	Disintegrate asm/system.h for Sparc	2012-03-28 18:30:03 +01:00
Kconfig	sparc32: generic clockevent support	2012-04-15 10:28:50 -07:00
Kconfig.debug	lib: consolidate DEBUG_STACK_USAGE option	2011-05-25 08:39:54 -07:00
Makefile	sparc32: Add -Av8 to assembler command line.	2012-03-13 18:19:51 -07:00