]> git.ipfire.org Git - people/ms/linux.git/commit
projects / people / ms / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 786f8ba 6622e67)
Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 1 Mar 2010 16:48:25 +0000 (08:48 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 1 Mar 2010 16:48:25 +0000 (08:48 -0800)
commite56425b135a8892d1e71ad5bb605d12c10efeb32
tree9bb899e1b6b45a125bcc21554f3673878d932035tree | snapshot
parent786f8ba2e9449a7f01ec6bc35838d0a335921061commit | diff
parent6622e670b26fbaa9c4ae7772a4d2d0abd3414b51commit | 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:
  posix-timers.c: Don't export local functions
  clocksource: start CMT at clocksource resume
  clocksource: add suspend callback
  clocksource: add argument to resume callback
  ntp: Cleanup xtime references in ntp.c
  ntp: Make time_esterror and time_maxerror static
arch/x86/kernel/tsc.c diff1 | diff2 | blob | history
drivers/clocksource/sh_cmt.c diff1 | diff2 | blob | history
kernel/time/clocksource.c diff1 | diff2 | blob | history
kernel/time/timekeeping.c diff1 | diff2 | blob | history
Michael's Linux tree.