diff options
author | Jens Axboe <jens.axboe@oracle.com> | 2010-02-28 19:41:12 +0100 |
---|---|---|
committer | Jens Axboe <jens.axboe@oracle.com> | 2010-02-28 19:41:12 +0100 |
commit | 6fc2de06ef1e691d032aa572478c905b7495a274 (patch) | |
tree | 778df1440b045d67c997d7bd79ee3c6c11f57638 /block/cfq-iosched.c | |
parent | block: remove padding from io_context on 64bit builds (diff) | |
parent | block: Consolidate phys_segment and hw_segment limits (diff) | |
download | linux-6fc2de06ef1e691d032aa572478c905b7495a274.tar.xz linux-6fc2de06ef1e691d032aa572478c905b7495a274.zip |
Merge branch 'for-2.6.34-next' into for-2.6.34
Diffstat (limited to 'block/cfq-iosched.c')
0 files changed, 0 insertions, 0 deletions