]> www.infradead.org Git - users/sagi/nvme-cli.git/commit
Merge https://github.com/linux-nvme/nvme-cli
authorJeff Lien <jeff.lien@wdc.com>
Fri, 6 Sep 2019 21:29:52 +0000 (16:29 -0500)
committerJeff Lien <jeff.lien@wdc.com>
Fri, 6 Sep 2019 21:29:52 +0000 (16:29 -0500)
commit4d462c8d7ff2c1b480825e0e1b09aefb398c9ab0
treeb965cb0df919d94f9edede7e9eb3717cf7540238
parentb0de4cb5b9966094c5020eb3d365950011afec8d
parent912f5b17f72c39d294640c0e579fda3a98302185
Merge https://github.com/linux-nvme/nvme-cli

Conflicts:
plugins/wdc/wdc-nvme.c
plugins/wdc/wdc-nvme.c