Merge branch 'for-4.7/dax' into libnvdimm-for-next
authorDan Williams <dan.j.williams@intel.com>
Sat, 21 May 2016 19:33:04 +0000 (12:33 -0700)
committerDan Williams <dan.j.williams@intel.com>
Sat, 21 May 2016 19:33:04 +0000 (12:33 -0700)
commit36092ee8ba695fce023b2118ececa6c2a56b1331
treeb9579893cdd559e7b72fa569003b19792de58fad
parent1b982baf75e7d9585967fcfccd05b77bf9054010
parent03dca343afe080968d90c4d9196404b5bbbc8461
Merge branch 'for-4.7/dax' into libnvdimm-for-next
drivers/nvdimm/bus.c
drivers/nvdimm/core.c
drivers/nvdimm/dimm_devs.c
drivers/nvdimm/nd-core.h
drivers/nvdimm/pfn_devs.c