| commit | 39a9f97e5ea99e048c4980c23cf197f6e77995cb | [log] [tgz] |
|---|---|---|
| author | Jens Axboe <axboe@fb.com> | Mon May 19 11:52:35 2014 -0600 |
| committer | Jens Axboe <axboe@fb.com> | Mon May 19 11:52:35 2014 -0600 |
| tree | b1f72ed1e852372b6d86b79157b09f77fabc5a20 | |
| parent | 1429d7c9467e1e3de0b0ff91d7e4d67c1a92f8a3 [diff] | |
| parent | 0d2602ca30e410e84e8bdf05c84ed5688e0a5a44 [diff] |
Merge branch 'for-3.16/blk-mq-tagging' into for-3.16/core Signed-off-by: Jens Axboe <axboe@fb.com> Conflicts: block/blk-mq-tag.c