]> 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, 13 Dec 2011 00:56:40 +0000 (11:56 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Dec 2011 00:56:40 +0000 (11:56 +1100)
commit183e156b6b8cef9168807522405e029bcde0b52c
treeefb9d5fb8fb90e100a7a9885020e67da163028b7
parenta900acd6b7761ea94e6e27ecccd02591d3439266
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/rtc/rtc-s3c.c