diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-21 15:43:43 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-21 15:43:43 -0700 |
commit | 5dfeaef89559d4968b0470adf749659f10d722f6 (patch) | |
tree | e38f4177b8e2e12cd1aa2e9910beea1dc3578784 /fs/ocfs2 | |
parent | 429f731dea577bdd43693940cdca524135287e6a (diff) | |
parent | 259aae864ceeb2b34e7bafa1ce18d096a357fab2 (diff) |
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
Diffstat (limited to 'fs/ocfs2')
0 files changed, 0 insertions, 0 deletions