Merge branch 'for-4.7/acpi6.1' into libnvdimm-for-next
authorDan Williams <dan.j.williams@intel.com>
Wed, 18 May 2016 17:07:19 +0000 (10:07 -0700)
committerDan Williams <dan.j.williams@intel.com>
Wed, 18 May 2016 17:07:19 +0000 (10:07 -0700)
commit1b982baf75e7d9585967fcfccd05b77bf9054010
treed997a2b60ea7eee0c6a17eb82cd4e7a0e3b09749
parent1f716d05f8daee4f393dc568ea7a53c7ecfd0bfc
parent6ca7208569550de43d64db6cf873706c371284a5
Merge branch 'for-4.7/acpi6.1' into libnvdimm-for-next
drivers/acpi/nfit.c
drivers/acpi/nfit.h