]> nv-tegra.nvidia Code Review - linux-2.6.git/commit
Merge commit 'origin/master' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Mon, 30 Mar 2009 03:04:53 +0000 (14:04 +1100)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Mon, 30 Mar 2009 03:04:53 +0000 (14:04 +1100)
commit9ff9a26b786c35ee8d2a66222924a807ec851a9f
treedb432a17bccca1ca2c16907f0ee83ac449ed4012
parent0a3108beea9143225119d5e7c72a8e2c64f3eb7d
parent0d34fb8e93ceba7b6dad0062dbb4a0813bacd75b
Merge commit 'origin/master' into next

Manual merge of:
arch/powerpc/include/asm/elf.h
drivers/i2c/busses/i2c-mpc.c
arch/powerpc/boot/dts/canyonlands.dts
arch/powerpc/include/asm/mmu-book3e.h
arch/powerpc/include/asm/ps3fb.h
arch/powerpc/kernel/asm-offsets.c
arch/powerpc/kernel/irq.c
arch/powerpc/kernel/vmlinux.lds.S
arch/x86/kernel/dumpstack.c
drivers/i2c/busses/i2c-mpc.c
drivers/watchdog/Kconfig
include/linux/pci_ids.h