Merge branch 'for-4.17/libnvdimm' into libnvdimm-for-next

author Dan Williams <dan.j.williams@intel.com>

Mon, 9 Apr 2018 17:50:08 +0000 (10:50 -0700)

committer Dan Williams <dan.j.williams@intel.com>

Mon, 9 Apr 2018 17:50:08 +0000 (10:50 -0700)
author Dan Williams <dan.j.williams@intel.com>
Mon, 9 Apr 2018 17:50:08 +0000 (10:50 -0700)
committer Dan Williams <dan.j.williams@intel.com>
Mon, 9 Apr 2018 17:50:08 +0000 (10:50 -0700)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/acpi/nfit/core.c
Simple merge
diff --cc drivers/nvdimm/pfn_devs.c
Simple merge
diff --cc drivers/nvdimm/region_devs.c
Simple merge
author	Dan Williams <dan.j.williams@intel.com>
	Mon, 9 Apr 2018 17:50:08 +0000 (10:50 -0700)
committer	Dan Williams <dan.j.williams@intel.com>
	Mon, 9 Apr 2018 17:50:08 +0000 (10:50 -0700)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/acpi/nfit/core.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/nvdimm/pfn_devs.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/nvdimm/region_devs.c	patch \|	diff1 \|	diff2 \|	blob \| history