aboutsummaryrefslogtreecommitdiff
path: root/include/scsi
diff options
context:
space:
mode:
authorLinus Torvalds2009-06-15 09:58:33 -0700
committerLinus Torvalds2009-06-15 09:58:33 -0700
commit3f27c0d2a469673e0f1efc8004b6f42428aa5b94 (patch)
tree548c975cabdcafcac92992d24410ae0a8334dff5 /include/scsi
parent9aaa630503f20461bee65ebc4fd87ba8d7a2bd2c (diff)
parentcd6d95d8449b7c9f415f26041e9ae173d387b6bd (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
Diffstat (limited to 'include/scsi')
0 files changed, 0 insertions, 0 deletions