Merge branch 'for-4.10/libnvdimm' into libnvdimm-for-next
authorDan Williams <dan.j.williams@intel.com>
Sat, 17 Dec 2016 23:08:10 +0000 (15:08 -0800)
committerDan Williams <dan.j.williams@intel.com>
Sat, 17 Dec 2016 23:08:10 +0000 (15:08 -0800)
commitc44ef859ceff45db1c72f9ccbfae96843c4b1501
treec97d8cab54f9d62faa5a5713298418ab93a452e0
parent325896ffdf90f7cbd59fb873b7ba20d60d1ddf3c
parentd7fe1a67f658b50ec98ee1afb86df7b35c2b2593
Merge branch 'for-4.10/libnvdimm' into libnvdimm-for-next
drivers/dax/dax.c
drivers/dax/pmem.c
drivers/nvdimm/namespace_devs.c
drivers/nvdimm/pmem.c
tools/testing/nvdimm/test/nfit.c