Merge branch 'for-4.9/libnvdimm' into libnvdimm-for-next
authorDan Williams <dan.j.williams@intel.com>
Fri, 7 Oct 2016 23:46:24 +0000 (16:46 -0700)
committerDan Williams <dan.j.williams@intel.com>
Fri, 7 Oct 2016 23:46:24 +0000 (16:46 -0700)
commit178d6f4be8bf42b298bedf8ea2a00754100e0c4e
treea71865455adc31082a4ad21a942286520a7b5da1
parentdb58028ee4e360430de8e3b48f657dc798ee6591
parent98a29c39dc689298d2f834f40102cba752eb49c0
Merge branch 'for-4.9/libnvdimm' into libnvdimm-for-next
drivers/acpi/nfit/core.c
drivers/acpi/nfit/mce.c
drivers/nvdimm/bus.c
drivers/nvdimm/core.c
drivers/nvdimm/nd.h
drivers/nvdimm/region_devs.c
tools/testing/nvdimm/test/nfit.c