| commit | 85d0331aedff4646b2a2b14561c8be3678ffcee2 | [log] [tgz] |
|---|---|---|
| author | Jens Axboe <axboe@fb.com> | Thu Jun 08 08:33:45 2017 -0600 |
| committer | Jens Axboe <axboe@fb.com> | Thu Jun 08 08:33:45 2017 -0600 |
| tree | 0ae7f21b848758bf809385c773529cbbe76c1fb4 | |
| parent | 6460495709aeb651896bc8e5c134b2e4ca7d34a8 [diff] | |
| parent | 9947d6a09cd71937dade2fc14640e4843ae19802 [diff] |
Merge branch 'nvme-4.12' of git://git.infradead.org/nvme into for-linus Christoph writes: "A few NVMe fixes for 4.12-rc, PCIe reset fixes and APST fixes, a RDMA reconnect fix, two FC fixes and a general controller removal fix."