]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'powerpc/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 7 Nov 2011 00:10:29 +0000 (11:10 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 7 Nov 2011 00:10:29 +0000 (11:10 +1100)
commit2262bb18be0b1ce0a99342e34bdc7dd6f6a5553b
tree1049f7322e5dba11489f19b5f3f2f2484dfb8fbc
parentd876e0fdf7dfa48748774b462786462b5edaf350
parent96cc017c5b7ec095ef047d3c1952b6b6bbf98943
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/p1022_ds.c
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