]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 429f731 259aae8)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 21 Apr 2008 22:43:43 +0000 (15:43 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 21 Apr 2008 22:43:43 +0000 (15:43 -0700)
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt:
  hrtimer: optimize the softirq time optimization
  hrtimer: reduce calls to hrtimer_get_softirq_time()
  clockevents: fix typo in tick-broadcast.c
  jiffies: add time_is_after_jiffies and others which compare with jiffies


Trivial merge
Linux 2.6 source tree