Merge branch 'for-4.12/dax' into libnvdimm-for-next
authorDan Williams <dan.j.williams@intel.com>
Fri, 5 May 2017 06:38:43 +0000 (23:38 -0700)
committerDan Williams <dan.j.williams@intel.com>
Fri, 5 May 2017 06:38:43 +0000 (23:38 -0700)
commit736163671bcb163fc82600b46c83dfa89d532d95
tree0639dc9d9fa180450b4e8fbda706eaae5f1876da
parentd5483feda85a8f39ee2e940e279547c686aac30c
parent1ef97fe4f8abd3317d5c3c860f990e02c2633959
Merge branch 'for-4.12/dax' into libnvdimm-for-next
drivers/acpi/nfit/core.c
drivers/dax/dax-private.h
drivers/dax/device.c
drivers/nvdimm/claim.c
drivers/nvdimm/pmem.c
tools/testing/nvdimm/Kbuild
tools/testing/nvdimm/dax-dev.c