]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 's5p/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 30 Nov 2011 00:51:18 +0000 (11:51 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 30 Nov 2011 00:51:18 +0000 (11:51 +1100)
commit9bd2a16608a7250a1e63af9596e1823969dda935
treefafd04dfd9caacc35d4a1bea6a0779675b3c142c
parent3b0f46e708b65294da2e4a62ab9eae9e2013b892
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