From: Arnd Bergmann Date: Fri, 15 Mar 2013 21:45:05 +0000 (+0100) Subject: Merge branch 'next/timer-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=bffc5ce34483f3121f0b06e55a34b8eb56d253fb;p=linux-beck.git Merge branch 'next/timer-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/drivers From Kukjin Kim : Here is re-work samsung-time which was s5p-time to support clocksource/clockevent API for s3c and s5pc100 timer driver. And this enables to support high resolution timer and tickles mode on them. Note, this depends on previous pull request (cleanup-s3c) because of touching while s3c stuff. * 'next/timer-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: ARM: SAMSUNG: Remove unused plat-samsung/time.c ARM: S5PC100: Add samsung-time support for s5pc100 ARM: S3C64XX: Add samsung-time support for s3c64xx ARM: S3C24XX: Add samsung-time support for s3c24xx ARM: SAMSUNG: Rename s5p-time to samsung-time ARM: S3C24XX: cleanup the included soc init functions in common.h ARM: S3C24XX: move plat-samsung/s3c24XX headers to local common.h ARM: S3C24XX: remove plat/irq.h in plat-samsung ARM: S3C24XX: plat/common-smdk.h local mmc: s3cmci: moved mach/regs-sdi.h into s3cmci device driver Signed-off-by: Arnd Bergmann --- bffc5ce34483f3121f0b06e55a34b8eb56d253fb