David S. Miller 90d3ac15e5 Merge commit '317f394160e9beb97d19a84c39b7e5eb3d7815a8' ... Conflicts: arch/sparc/kernel/smp_32.c With merge conflict help from Daniel Hellstrom. Signed-off-by: David S. Miller <davem@davemloft.net>		2011-05-20 13:10:22 -07:00
..
boot	sparc32: added U-Boot build target: uImage	2011-03-16 18:19:04 -07:00
configs	defconfig reduction	2010-08-14 22:26:53 +02:00
include/asm	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6	2011-05-20 12:59:54 -07:00
kernel	Merge commit '317f394160e9beb97d19a84c39b7e5eb3d7815a8'	2011-05-20 13:10:22 -07:00
lib	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6	2011-05-20 12:59:54 -07:00
math-emu	Fix common misspellings	2011-03-31 11:26:23 -03:00
mm	sparc: convert old cpumask API into new one	2011-05-16 13:38:07 -07:00
oprofile	sparc: using HZ needs an include of linux/param.h	2009-10-05 00:46:08 -07:00
prom	sparc32: remove tick14.c	2011-03-16 18:19:08 -07:00
Kconfig	sparc32: implement SMP IPIs using the generic functions	2011-05-16 13:07:43 -07:00
Kconfig.debug	sparc: Kill user copy check code.	2010-08-09 00:45:46 -07:00
Makefile	sparc32: added U-Boot build target: uImage	2011-03-16 18:19:04 -07:00