You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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>		15 years ago
..
boot	powerpc/83xx: Add MCU LEDs support for MPC837xRDB and MPC8315RDB boards	15 years ago
configs	powerpc: Build-in e1000e for pseries & ppc64_defconfig	15 years ago
include/asm	Merge remote branch 'origin' into secretlab/next-devicetree	15 years ago
kernel	Merge remote branch 'origin' into secretlab/next-devicetree	15 years ago
kvm	Merge branch 'kvm-updates/2.6.35' of git://git.kernel.org/pub/scm/virt/kvm/kvm	15 years ago
lib	powerpc: Fix string library functions	15 years ago
math-emu	powerpc/math-emu: Fix efp dependence	16 years ago
mm	Merge branch 'kvm-updates/2.6.35' of git://git.kernel.org/pub/scm/virt/kvm/kvm	15 years ago
oprofile	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	15 years ago
platforms	Merge remote branch 'origin' into secretlab/next-devicetree	15 years ago
sysdev	Merge remote branch 'origin' into secretlab/next-devicetree	15 years ago
xmon	powerpc: Mark some variables in the page fault path __read_mostly	15 years ago
Kconfig	powerpc: Add kprobe-based event tracer	15 years ago
Kconfig.debug	powerpc/cpumask: Add DEBUG_PER_CPU_MAPS option	15 years ago
Makefile	powerpc: Check for unsupported relocs when using CONFIG_RELOCATABLE	16 years ago
relocs_check.pl	powerpc: Check for unsupported relocs when using CONFIG_RELOCATABLE	16 years ago