Merge branch 'for-4.16/dax' into libnvdimm-for-next
authorRoss Zwisler <ross.zwisler@linux.intel.com>
Sat, 3 Feb 2018 07:26:10 +0000 (00:26 -0700)
committerRoss Zwisler <ross.zwisler@linux.intel.com>
Sat, 3 Feb 2018 07:26:10 +0000 (00:26 -0700)
commitd121f07691415df824e6b60520f782f6d13b3c81
tree422ad3cc6fd631604fef4e469e49bacba8202e52
parent59858d3d54cfad1f8db67c2c07e4dd33bb6ed955
parent569d0365f571fa6421a5c80bc30d1b2cdab857fe
Merge branch 'for-4.16/dax' into libnvdimm-for-next
drivers/acpi/nfit/core.c
drivers/nvdimm/btt.c