| commit | f89e0dd9d1a72fdf6b8958bcadfa6abf84f3cae0 | [log] [tgz] |
|---|---|---|
| author | Jens Axboe <axboe@fb.com> | Tue Apr 15 14:02:24 2014 -0600 |
| committer | Jens Axboe <axboe@fb.com> | Tue Apr 15 14:02:24 2014 -0600 |
| tree | 6d4ca8c67dc22d1c81053392078588f9ab3804b5 | |
| parent | 21f9fcd81593e201172160853b8647336fb81f4f [diff] | |
| parent | c9eaa447e77efe77b7fa4c953bd62de8297fd6c5 [diff] |
Merge tag 'v3.15-rc1' into for-3.16/core We don't like this, but things have diverged with the blk-mq fixes in 3.15-rc1. So merge it in.