]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'powerpc/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 3 Nov 2011 02:35:33 +0000 (13:35 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 3 Nov 2011 02:35:33 +0000 (13:35 +1100)
commita1be3f536c5581975050539d2fd2d90db8aa898f
tree844df24143541699038e1e6d625a7bcc0873bf40
parent737e2a0145d9d529c6470fee057738a1640b465e
parent7680057cc4c7d9caada12767831bfd9738dd7b43
Merge remote-tracking branch 'powerpc/next'

Conflicts:
arch/powerpc/configs/40x/hcu4_defconfig
arch/powerpc/include/asm/udbg.h
arch/powerpc/kernel/udbg.c
drivers/tty/serial/8250.c
18 files changed:
arch/powerpc/Kconfig
arch/powerpc/configs/ppc40x_defconfig
arch/powerpc/include/asm/udbg.h
arch/powerpc/kernel/asm-offsets.c
arch/powerpc/kernel/exceptions-64s.S
arch/powerpc/kernel/udbg.c
arch/powerpc/mm/hugetlbpage.c
arch/powerpc/platforms/40x/Kconfig
arch/powerpc/platforms/85xx/Kconfig
drivers/gpio/Kconfig
drivers/gpio/Makefile
drivers/net/ethernet/toshiba/ps3_gelic_net.c
drivers/net/ethernet/toshiba/ps3_gelic_net.h
drivers/of/fdt.c
drivers/tty/hvc/hvcs.c
drivers/tty/serial/8250.c
include/linux/dma-mapping.h
kernel/sched.c