]> 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, 14 Dec 2011 00:17:56 +0000 (11:17 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Dec 2011 00:17:56 +0000 (11:17 +1100)
commit7afcd7610415a03f70e578bfcef2554a987d9741
treef1de5086e2190c46a22e76c93960f0c6bf7cee90
parent087082f9d7b67b531952be4e28827d0b08c958c1
parent57894d3915d9d3940f2ad273aadf02070f396888
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
arch/arm/mach-s5pv210/mach-smdkv210.c
drivers/mmc/host/sdhci-s3c.c
drivers/rtc/rtc-s3c.c