summaryrefslogtreecommitdiffstats
path: root/Documentation/cpu-hotplug.txt
diff options
context:
space:
mode:
authorJens Axboe <jens.axboe@oracle.com>2009-11-03 21:14:39 +0100
committerJens Axboe <jens.axboe@oracle.com>2009-11-03 21:14:39 +0100
commit2058297d2d045cb57138c33b87cfabcc80e65186 (patch)
tree7ccffd0e162cbd7471f643561e79f23abb989a62 /Documentation/cpu-hotplug.txt
parentMerge branch 'cfq-2.6.33' into for-2.6.33 (diff)
parentcfq-iosched: limit coop preemption (diff)
downloadlinux-2058297d2d045cb57138c33b87cfabcc80e65186.tar.xz
linux-2058297d2d045cb57138c33b87cfabcc80e65186.zip
Merge branch 'for-linus' into for-2.6.33
Conflicts: block/cfq-iosched.c Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'Documentation/cpu-hotplug.txt')
0 files changed, 0 insertions, 0 deletions