]> 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, 24 Nov 2011 01:24:50 +0000 (12:24 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 24 Nov 2011 01:24:50 +0000 (12:24 +1100)
commitfe1766be6bb2e4a345452fb88948593b802c036a
treeab33d27558b6877a74ad0b70ad5af6eb63547b44
parentb3b23bf17fd019fcb5b34f97f439812ab7998db8
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