]> git.baikalelectronics.ru Git - kernel.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)
commit82c3977bcb38e356f37d1636fd71f717886d522c
tree06a5a9a08519950575505273eabced331ed51405
parente945ab5fa06533b588c8cda13465d928b16639f2
parente45c38a68f8dbd7e24dbfb5fe297ebf0085e1041
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