linux/arch/powerpc
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 powerpc/83xx: Add MCU LEDs support for MPC837xRDB and MPC8315RDB boards 2010-05-17 10:55:32 -05:00
configs powerpc: Build-in e1000e for pseries & ppc64_defconfig 2010-05-21 17:31:12 +10: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
kvm Merge branch 'kvm-updates/2.6.35' of git://git.kernel.org/pub/scm/virt/kvm/kvm 2010-05-21 17:16:21 -07:00
lib powerpc: Fix string library functions 2010-05-21 17:31:08 +10:00
math-emu powerpc/math-emu: Fix efp dependence 2009-03-11 06:00:08 -05:00
mm Merge branch 'kvm-updates/2.6.35' of git://git.kernel.org/pub/scm/virt/kvm/kvm 2010-05-21 17:16:21 -07:00
oprofile include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
platforms Merge remote branch 'origin' into secretlab/next-devicetree 2010-05-22 00:36:56 -06:00
sysdev Merge remote branch 'origin' into secretlab/next-devicetree 2010-05-22 00:36:56 -06:00
xmon powerpc: Mark some variables in the page fault path __read_mostly 2010-02-03 17:39:48 +11:00
Kconfig powerpc: Add kprobe-based event tracer 2010-04-07 18:11:43 +10:00
Kconfig.debug powerpc/cpumask: Add DEBUG_PER_CPU_MAPS option 2010-05-06 18:05:26 +10:00
Makefile powerpc: Check for unsupported relocs when using CONFIG_RELOCATABLE 2009-09-24 15:31:40 +10:00
relocs_check.pl powerpc: Check for unsupported relocs when using CONFIG_RELOCATABLE 2009-09-24 15:31:40 +10:00