]> 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, 30 Aug 2011 02:07:07 +0000 (12:07 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 30 Aug 2011 02:08:40 +0000 (12:08 +1000)
commit8deb02a73e52422e66b9a29efb38115a2b733f54
treeefd0c2cf0fd423fa688bc1f41400eaf492906592
parent36153f95694e9709cd59a0628daf98770b2bb5f9
parenta08b7e19811181309da2306338027fe1d3f8001d
Merge remote-tracking branch 's5p/for-next'

Conflicts:
arch/arm/mach-exynos4/mach-smdkc210.c
12 files changed:
arch/arm/mach-exynos4/mach-nuri.c
arch/arm/mach-exynos4/mach-smdkv310.c
arch/arm/mach-exynos4/mach-universal_c210.c
arch/arm/mach-s3c64xx/cpu.c
arch/arm/mach-s3c64xx/mach-crag6410.c
arch/arm/mach-s3c64xx/mach-mini6410.c
arch/arm/mach-s3c64xx/mach-real6410.c
arch/arm/mach-s3c64xx/mach-smdk6410.c
arch/arm/mach-s5p64x0/mach-smdk6440.c
arch/arm/mach-s5p64x0/mach-smdk6450.c
arch/arm/mach-s5pc100/mach-smdkc100.c
arch/arm/mach-s5pv210/mach-smdkv210.c