]> 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, 20 Dec 2011 23:23:37 +0000 (10:23 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 20 Dec 2011 23:23:37 +0000 (10:23 +1100)
commitb24c9e007b38f588505787dcd87e05bcb55cacbd
tree78273106411ac0a07e53c5e6c8b0d51d5c100a51
parent126f92ac18ced20fffa46235d19aa4911b6dc483
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