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)
commit5dfeaef89559d4968b0470adf749659f10d722f6
treee38f4177b8e2e12cd1aa2e9910beea1dc3578784
parent429f731dea577bdd43693940cdca524135287e6a
parent259aae864ceeb2b34e7bafa1ce18d096a357fab2
Merge branch 'master' of git://git./linux/kernel/git/tglx/linux-2.6-hrt

* '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