| commit | 04bf7869ca0fd12009aee301cac2264a36df4d98 | [log] [tgz] |
|---|---|---|
| author | Jens Axboe <jaxboe@fusionio.com> | Fri Jul 01 16:17:13 2011 +0200 |
| committer | Jens Axboe <jaxboe@fusionio.com> | Fri Jul 01 16:17:13 2011 +0200 |
| tree | 66cb81ebf8b76560a31433c2c493dc430c914af9 | |
| parent | d2f31a5fd60d168b00fc4f7617b68a1287b21e90 [diff] | |
| parent | 7b28afe01ab6ffb5f152f47831b44933facd2328 [diff] |
Merge branch 'for-linus' into for-3.1/core Conflicts: block/blk-throttle.c block/cfq-iosched.c Signed-off-by: Jens Axboe <jaxboe@fusionio.com>