From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 21 Apr 2008 22:43:43 +0000 (-0700)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux... 
X-Git-Tag: v2.6.26-rc1~1129
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=5dfeaef89559d4968b0470adf749659f10d722f6;p=linux-2.6-omap-h63xx.git

Merge branch 'master' of git://git.kernel.org/pub/scm/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
---

5dfeaef89559d4968b0470adf749659f10d722f6