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

diff --cc drivers/acpi/nfit/core.c
Simple merge

diff --cc drivers/acpi/nfit/mce.c
Simple merge

diff --cc drivers/nvdimm/bus.c
Simple merge

diff --cc drivers/nvdimm/core.c
Simple merge

diff --cc drivers/nvdimm/nd.h
Simple merge

diff --cc drivers/nvdimm/region_devs.c
Simple merge

diff --cc tools/testing/nvdimm/test/nfit.c
Simple merge