diff options
| author | Jens Axboe <axboe@fb.com> | 2017-04-21 11:14:22 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2017-04-21 11:14:22 -0600 |
| commit | f8a05a1d01d9bb8aba78339d1e4b559e5db3b716 (patch) | |
| tree | 05fe6fff3da3ffb320c6ec53958974ce263382fe /block | |
| parent | 95c55ff425faa190fd8ba55090fbdf33d8b2f0ae (diff) | |
| parent | e02ab0230489461fd9fdd8028841dae6f03a4874 (diff) | |
Merge branch 'nvme-4.12' of git://git.infradead.org/nvme into for-4.12/block
Christoph writes:
This is the current NVMe pile: virtualization extensions, lots of FC
updates and various misc bits. There are a few more FC bits that didn't
make the cut, but we'd like to get this request out before the merge
window for sure.
Diffstat (limited to 'block')
0 files changed, 0 insertions, 0 deletions