Merge branch 'for-4.7/dsm' into libnvdimm-for-next
authorDan Williams <dan.j.williams@intel.com>
Wed, 18 May 2016 17:06:59 +0000 (10:06 -0700)
committerDan Williams <dan.j.williams@intel.com>
Wed, 18 May 2016 17:06:59 +0000 (10:06 -0700)
commit1f716d05f8daee4f393dc568ea7a53c7ecfd0bfc
tree3ba46ef65cd2fb1766934769c1d4a7fc16c3fe61
parent2159669f581917c4d197d3ea183d3d85b47faf66
parenta94e3fbe4d53d4e512c4ea88a475e605b8d8dccb
Merge branch 'for-4.7/dsm' into libnvdimm-for-next
drivers/acpi/nfit.c
drivers/acpi/nfit.h
drivers/nvdimm/bus.c
drivers/nvdimm/nd-core.h
include/uapi/linux/ndctl.h
tools/testing/nvdimm/test/nfit.c