]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'v3.4-next/devel-samsung-rtc' of git://git.kernel.org/pub/scm/linux...
authorArnd Bergmann <arnd@arndb.de>
Mon, 13 Feb 2012 06:01:37 +0000 (06:01 +0000)
committerArnd Bergmann <arnd@arndb.de>
Mon, 13 Feb 2012 06:01:37 +0000 (06:01 +0000)
* 'v3.4-next/devel-samsung-rtc' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: S3C2443/S3C2416: add s3c_rtc_setname and rename rtc devices
  rtc-s3c: add variants for S3C2443 and S3C2416
  rtc-s3c: make room for more variants in devicetree block
  ARM: SAMSUNG: cleanup of rtc register definitions

1  2 
arch/arm/mach-s3c2416/s3c2416.c

Simple merge