From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 15 Jun 2009 16:58:33 +0000 (-0700)
Subject: Merge branch 'timers-for-linus-clocksource' of git://git.kernel.org/pub/scm/linux... 
X-Git-Tag: v2.6.31-rc1~328
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=3f27c0d2a469673e0f1efc8004b6f42428aa5b94;p=~andy%2Flinux

Merge branch 'timers-for-linus-clocksource' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'timers-for-linus-clocksource' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  clocksource: prevent selection of low resolution clocksourse also for nohz=on
  clocksource: sanity check sysfs clocksource changes
---

3f27c0d2a469673e0f1efc8004b6f42428aa5b94