tree 548c975cabdcafcac92992d24410ae0a8334dff5
parent 9aaa630503f20461bee65ebc4fd87ba8d7a2bd2c
parent cd6d95d8449b7c9f415f26041e9ae173d387b6bd
author Linus Torvalds <torvalds@linux-foundation.org> 1245085113 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1245085113 -0700

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