]> git.karo-electronics.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4277616 96c8f06)
Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 11 Jan 2011 19:06:41 +0000 (11:06 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 11 Jan 2011 19:06:41 +0000 (11:06 -0800)
commit5943a268002fce97885f2ca08827ff1b0312068c
tree5e304e79b68263e799224ebb1a08ead474ab299btree | snapshot
parent42776163e13a56ea3096edff7a5df95408e80eb4commit | diff
parent96c8f06a0fb359a9a89701a7afab6d837e466ab0commit | diff
Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* '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
drivers/rtc/class.c diff1 | diff2 | blob | history
Linux kernel for KaRo TX COM modules