| commit | 3f27c0d2a469673e0f1efc8004b6f42428aa5b94 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jun 15 09:58:33 2009 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jun 15 09:58:33 2009 -0700 |
| tree | 548c975cabdcafcac92992d24410ae0a8334dff5 | |
| parent | 9aaa630503f20461bee65ebc4fd87ba8d7a2bd2c [diff] | |
| parent | cd6d95d8449b7c9f415f26041e9ae173d387b6bd [diff] |
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