Merge branch 'for-4.7/acpi6.1' into libnvdimm-for-next