Merge branch 'for-4.8/libnvdimm' into libnvdimm-for-next
authorDan Williams <dan.j.williams@intel.com>
Sun, 24 Jul 2016 15:05:44 +0000 (08:05 -0700)
committerDan Williams <dan.j.williams@intel.com>
Sun, 24 Jul 2016 15:05:44 +0000 (08:05 -0700)
commit0606263f24f3d64960de742c55894190b5df903b
tree673894f227c1a761f601ad7bdc1ceef003bb85cb
parenta72255983f12f31f0c8d8275fb1a781546cfacb7
parentd4c5725d57323e2348940fcc6416072671a9b432
Merge branch 'for-4.8/libnvdimm' into libnvdimm-for-next
arch/x86/kvm/vmx.c
drivers/acpi/nfit/core.c
drivers/acpi/nfit/nfit.h
fs/dax.c