]> nv-tegra.nvidia Code Review - linux-2.6.git/commit
Merge commit 'origin'
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Wed, 15 Oct 2008 00:31:54 +0000 (11:31 +1100)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Wed, 15 Oct 2008 00:31:54 +0000 (11:31 +1100)
commit6dc6472581f693b5fc95aebedf67b4960fb85cf0
tree06a5a9a08519950575505273eabced331ed51405
parentee673eaa72d8d185012b1027a05e25aba18c267f
parent8acd3a60bcca17c6d89c73cee3ad6057eb83ba1e
Merge commit 'origin'

Manual fixup of conflicts on:

arch/powerpc/include/asm/dcr-regs.h
drivers/net/ibm_newemac/core.h
12 files changed:
arch/powerpc/boot/Makefile
arch/powerpc/boot/dts/mpc8610_hpcd.dts
arch/powerpc/include/asm/sections.h
arch/powerpc/kernel/smp.c
arch/powerpc/platforms/cell/spufs/inode.c
drivers/block/floppy.c
drivers/char/hvc_console.c
drivers/net/ibm_newemac/Kconfig
drivers/net/ibm_newemac/mal.h
drivers/net/ibm_newemac/phy.c
drivers/pnp/pnpbios/core.c
drivers/serial/Kconfig