]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 's5p/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 1 Dec 2011 23:48:14 +0000 (10:48 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 1 Dec 2011 23:48:14 +0000 (10:48 +1100)
commitff0d79444cb5a928459fe57e91b4c03ec00f3789
tree399529bcaf00c2e99cf7e1e115ea03e4403a3fa3
parentd2719edcf3d01cb4185c881b01ef7b2b5543e71b
parenta188e1e2048bc5fc7b289d0c23abb39232be8a60
Merge remote-tracking branch 's5p/for-next'

Conflicts:
arch/arm/mach-exynos/cpu.c
arch/arm/mach-exynos/include/mach/entry-macro.S
arch/arm/mach-exynos/cpu.c
arch/arm/mach-exynos/mach-origen.c
arch/arm/mach-s3c64xx/mach-crag6410.c
drivers/tty/serial/Kconfig