]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'timers/urgent' into auto-latest
authorIngo Molnar <mingo@elte.hu>
Mon, 5 Dec 2011 12:33:42 +0000 (13:33 +0100)
committerIngo Molnar <mingo@elte.hu>
Mon, 5 Dec 2011 12:33:42 +0000 (13:33 +0100)
1  2 
drivers/rtc/class.c
drivers/rtc/interface.c

Simple merge
Simple merge