]> 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, 19 Dec 2011 00:01:51 +0000 (11:01 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 19 Dec 2011 00:01:51 +0000 (11:01 +1100)
commitf51a36b007d05e29700b421b1e2052b9d23c81bc
treee0fb68b8f23e0c2c9056ad976ad5ca25d564d622
parent5e01313104fa34baa5b428cca36bf276f8c24a0e
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-exynos/cpu.c
arch/arm/mach-exynos/mach-origen.c
drivers/mmc/host/sdhci-s3c.c
drivers/rtc/rtc-s3c.c