Merge branch 'nvml-to-pmdk' of https://github.com/sscargal/fio
authorJens Axboe <axboe@kernel.dk>
Tue, 17 Apr 2018 01:40:46 +0000 (19:40 -0600)
committerJens Axboe <axboe@kernel.dk>
Tue, 17 Apr 2018 01:40:46 +0000 (19:40 -0600)
commitc7d32225c3efe61c79470bc31bb369b33d3e3a88
tree6832ac00eb6c6656c5cd18b324463179d6905cd6
parentc5477c6a3b3e0042b1f74414071429ca66d94c2f
parent363a5f6568b682071153e4c570ecc60186d6c814
Merge branch 'nvml-to-pmdk' of https://github.com/sscargal/fio

* 'nvml-to-pmdk' of https://github.com/sscargal/fio:
  NVML references renamed to PMDK