projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4277616 96c8f06)
Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <[email protected]>
Tue, 11 Jan 2011 19:06:41 +0000 (11:06 -0800)
committerLinus Torvalds <[email protected]>
Tue, 11 Jan 2011 19:06:41 +0000 (11:06 -0800)
* 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  rtc: Namespace fixup
  RTC: Remove UIE emulation
  RTC: Rework RTC code to use timerqueue for events

Fix up trivial conflict in drivers/rtc/rtc-dev.c

1  2 
drivers/rtc/class.c patch | diff1 | diff2 | blob | history

diff --cc drivers/rtc/class.c
Simple merge
John Crispins staging tree