]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 's5p/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Sun, 11 Dec 2011 23:51:23 +0000 (10:51 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Sun, 11 Dec 2011 23:51:23 +0000 (10:51 +1100)
commit22bb488a2c333875758d6a7c1ff3dd41479deaf7
tree53d735d7b5aac0ca071d09c2f2579480dc38366c
parent3c35506380f1c0c3e8ff259ef197a2c789746e5b
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