Merge branch 'for-4.7/libnvdimm' into libnvdimm-for-next
authorDan Williams <dan.j.williams@intel.com>
Wed, 18 May 2016 17:06:48 +0000 (10:06 -0700)
committerDan Williams <dan.j.williams@intel.com>
Wed, 18 May 2016 17:06:48 +0000 (10:06 -0700)
commit2159669f581917c4d197d3ea183d3d85b47faf66
tree9faa8bbf19fa1ea33e371b02cfa5a5b4507583de
parent594d6d96ea042366878aa7dc7f5711b8c245db5a
parent9dec4892ca9afd6aad3c9c9e6c17480ecbd04440
Merge branch 'for-4.7/libnvdimm' into libnvdimm-for-next
drivers/acpi/nfit.c
drivers/nvdimm/btt.c
drivers/nvdimm/bus.c
include/uapi/linux/ndctl.h