Merge branch 'fortglx/39/tip/timers/rtc' of git://git.linaro.org/people/jstultz/linux...
commit92f73a62a100d2068e8f327e573da01529184c18
authorThomas Gleixner <tglx@linutronix.de>
Tue, 12 Apr 2011 23:54:09 +0000 (13 01:54 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Tue, 12 Apr 2011 23:54:09 +0000 (13 01:54 +0200)
tree48a42be3879d8467c1860d3f14045feb6fccd64e
parenta6360dd37e1a144ed11e6548371bade559a1e4df
parent67c1b8c6aa354aad14aad85d36508fd73d1c6361
Merge branch 'fortglx/39/tip/timers/rtc' of git://git.linaro.org/people/jstultz/linux into timers/urgent
drivers/rtc/interface.c
drivers/rtc/rtc-bfin.c