]> 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, 29 Nov 2011 00:06:14 +0000 (11:06 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 29 Nov 2011 00:06:14 +0000 (11:06 +1100)
commitc740ed01c212d62c9588e0370758436d3ad25557
treeb476661c04278e93e1f31686edccbb147b7d733f
parent9fa456371b81c957bb6984a25b3a91ad5895d9d1
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