diff options
| author | Jens Axboe <axboe@fb.com> | 2014-05-28 11:50:26 -0400 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2014-05-28 11:50:26 -0400 |
| commit | 6178976500ae61fa7b12ebb2d3de816dc9396388 (patch) | |
| tree | 143df1479f56458801b676d038e6a7157a472981 /include/linux/string_helpers.h | |
| parent | 6314a108ec19aefa5160535b2bfe1ca9c38efe37 (diff) | |
| parent | d852564f8c88b0604490234fdeeb6fb47e4bcc7a (diff) | |
Merge branch 'for-3.16/core' into for-3.16/drivers
mtip32xx uses blk_mq_alloc_reserved_request(), so pull in the
core changes so we have a properly merged end result.
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'include/linux/string_helpers.h')
0 files changed, 0 insertions, 0 deletions