Merge branch 'for-4.13/dax' into libnvdimm-for-next
authorDan Williams <dan.j.williams@intel.com>
Mon, 3 Jul 2017 23:54:58 +0000 (16:54 -0700)
committerDan Williams <dan.j.williams@intel.com>
Mon, 3 Jul 2017 23:54:58 +0000 (16:54 -0700)
commit9d92573fff3ec70785ef1815cc80573f70e7a921
treebce6e6bbad56f805d1adcebddabf9dd9e8072ce4
parent2de5148ffb12ff6b4088125f44818771e78e6830
parent0b277961f4484fb3f142caaa1dd1748cb0b2cbee
Merge branch 'for-4.13/dax' into libnvdimm-for-next
12 files changed:
MAINTAINERS
drivers/acpi/nfit/core.c
drivers/nvdimm/bus.c
drivers/nvdimm/claim.c
drivers/nvdimm/core.c
drivers/nvdimm/dax_devs.c
drivers/nvdimm/namespace_devs.c
drivers/nvdimm/pfn_devs.c
drivers/nvdimm/pmem.c
drivers/nvdimm/pmem.h
drivers/nvdimm/region_devs.c
include/linux/libnvdimm.h