Grant Likely cf9b59e9d3 Merge remote branch 'origin' into secretlab/next-devicetree ... Merging in current state of Linus' tree to deal with merge conflicts and build failures in vio.c after merge. Conflicts: drivers/i2c/busses/i2c-cpm.c drivers/i2c/busses/i2c-mpc.c drivers/net/gianfar.c Also fixed up one line in arch/powerpc/kernel/vio.c to use the correct node pointer. Signed-off-by: Grant Likely <grant.likely@secretlab.ca>		2010-05-22 00:36:56 -06:00
..
boot	arch/sparc/boot/*.c: Mark various internal functions static	2009-11-15 15:01:40 -08:00
configs	sparc64: Update defconfig.	2010-04-03 16:18:32 -07:00
include/asm	Merge remote branch 'origin' into secretlab/next-devicetree	2010-05-22 00:36:56 -06:00
kernel	Merge remote branch 'origin' into secretlab/next-devicetree	2010-05-22 00:36:56 -06:00
lib	sparc64: Allocate sufficient stack space in ftrace stubs.	2010-04-13 18:59:02 -07:00
math-emu	sparc: Add alignment and emulation fault perf events.	2009-12-11 01:07:53 -08:00
mm	Merge branch 'master' into export-slabh	2010-04-05 11:37:28 +09:00
oprofile	sparc: using HZ needs an include of linux/param.h	2009-10-05 00:46:08 -07:00
prom	sparc64: Make prom entry spinlock NMI safe.	2010-03-03 09:06:03 -08:00
Kconfig	Merge branch 'timers-for-linus-cleanups' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2010-05-19 17:10:06 -07:00
Kconfig.debug	sparc64: Kill CONFIG_STACK_DEBUG code.	2010-04-12 22:36:03 -07:00
Makefile	sparc: Set UTS_MACHINE correctly.	2009-12-05 17:17:55 -08:00