]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 's5p/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 5 Dec 2011 23:29:44 +0000 (10:29 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 5 Dec 2011 23:29:44 +0000 (10:29 +1100)
commitb76088c2f388e9a9a58cf71f737502d645aa058a
treea8469e8f46a4d5faa2f82f369243d786b0b0880f
parentd0f917595b7c5cba3d00aeeb8295e2438435a796
parentd3d936c5252dc10c47fdc73d64e0b71e7d27503b
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-s3c64xx/mach-crag6410.c
arch/arm/mach-exynos/cpu.c
arch/arm/mach-exynos/mach-origen.c
arch/arm/mach-s3c64xx/mach-crag6410.c