| commit | e37459b8e2c7db6735e39e019e448b76e5e77647 | [log] [tgz] |
|---|---|---|
| author | Jens Axboe <axboe@kernel.dk> | Fri Nov 08 09:08:12 2013 -0700 |
| committer | Jens Axboe <axboe@kernel.dk> | Fri Nov 08 09:08:12 2013 -0700 |
| tree | a3f0944db87a8ae0d41e5acbbbabc1e7ef534d1b | |
| parent | c7d1ba417c7cb7297d14dd47a390ec90ce548d5c [diff] | |
| parent | e7e245000110a7794de8f925b9edc06a9c852f80 [diff] |
Merge branch 'blk-mq/core' into for-3.13/core Signed-off-by: Jens Axboe <axboe@kernel.dk> Conflicts: block/blk-timeout.c