| commit | 7169ff4a0942adf524f25713eaed30599d438926 | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Tue Feb 28 12:38:46 2012 +0000 |
| committer | Arnd Bergmann <arnd@arndb.de> | Tue Feb 28 12:38:46 2012 +0000 |
| tree | 08e7077a48d2d5acd4008fec28a913e1d6ee29ee | |
| parent | e135e4506c6d3e9b196890877a9a2815f71b04ac [diff] | |
| parent | 4128e27584f58bce9f56a9a0346650c94a651332 [diff] |
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