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

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

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

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

diff --cc include/uapi/linux/ndctl.h
Simple merge