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

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

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

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

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

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