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)
* '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

1  2 
arch/arm/Kconfig

Simple merge