]> 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 Sep 2011 02:57:00 +0000 (12:57 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 5 Sep 2011 02:57:02 +0000 (12:57 +1000)
commit87deb6ea56f8a6edabe3bba41cc5d53c6056b46b
tree8674b66f39510c85915a88e6e5661a370801df24
parent9db129f74028ae6b0c4256a16e50321cfedd7251
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