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

Simple merge
Simple merge