Merge branch 'timers-for-linus-clocksource' of git://git.kernel.org/pub/scm/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 15 Jun 2009 16:58:33 +0000 (09:58 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 15 Jun 2009 16:58:33 +0000 (09:58 -0700)
commit3f27c0d2a469673e0f1efc8004b6f42428aa5b94
tree548c975cabdcafcac92992d24410ae0a8334dff5
parent9aaa630503f20461bee65ebc4fd87ba8d7a2bd2c
parentcd6d95d8449b7c9f415f26041e9ae173d387b6bd
Merge branch 'timers-for-linus-clocksource' of git://git./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