Merge branch 'rtc-sa1100' of git://github.com/hzhuang1/linux into next/drivers
authorArnd Bergmann <arnd@arndb.de>
Tue, 28 Feb 2012 12:38:46 +0000 (12:38 +0000)
committerArnd Bergmann <arnd@arndb.de>
Tue, 28 Feb 2012 12:38:46 +0000 (12:38 +0000)
commit7169ff4a0942adf524f25713eaed30599d438926
tree08e7077a48d2d5acd4008fec28a913e1d6ee29ee
parente135e4506c6d3e9b196890877a9a2815f71b04ac
parent4128e27584f58bce9f56a9a0346650c94a651332
Merge branch 'rtc-sa1100' of git://github.com/hzhuang1/linux into next/drivers

* 'rtc-sa1100' of git://github.com/hzhuang1/linux:
  ARM: mmp: enable rtc in pxa910
  rtc: sa1100: enable clk support
  ARM: pxa: add rtc dummy clock
  ARM: sa1100: clean up clock support
  rtc: sa1100: declare irq in resource
  rtc: sa1100: remove verification code of alarm
  rtc: sa1100: remove periodic code
arch/arm/Kconfig