]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 's5p/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 22 Nov 2011 02:05:03 +0000 (13:05 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 22 Nov 2011 02:05:03 +0000 (13:05 +1100)
commitebc415692ada4d131efdb31a49f54e89ef14442f
treed973f436ae3405dae0d28626b5963048153ac3b9
parent0a8bee30b88a114ee4e79dc27b9975d81e0a3de6
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