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
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
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
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
Kconfig
Kconfig.debug
Makefile
relocs_check.pl