diff options
author | Jens Axboe <axboe@kernel.dk> | 2019-02-13 07:32:30 -0700 |
---|---|---|
committer | Jens Axboe <axboe@kernel.dk> | 2019-02-13 07:32:30 -0700 |
commit | ace74f73c200df4254788210ac70e00a7aeca4b8 (patch) | |
tree | 840b990396c0556d65d44a2bf8fef5998b0a5dbf /net/core/sock.c | |
parent | Merge branch 'md-fixes' of https://github.com/liu-song-6/linux into for-linus (diff) | |
parent | nvme-pci: add missing unlock for reset error (diff) | |
download | linux-dev-ace74f73c200df4254788210ac70e00a7aeca4b8.tar.xz linux-dev-ace74f73c200df4254788210ac70e00a7aeca4b8.zip |
Merge branch 'nvme-5.0' of git://git.infradead.org/nvme into for-linus
Pull single NVMe fix from Christoph
* 'nvme-5.0' of git://git.infradead.org/nvme:
nvme-pci: add missing unlock for reset error
Diffstat (limited to 'net/core/sock.c')
0 files changed, 0 insertions, 0 deletions