Merge branch 'for-4.9/dax' into libnvdimm-for-next
authorDan Williams <dan.j.williams@intel.com>
Fri, 7 Oct 2016 23:46:30 +0000 (16:46 -0700)
committerDan Williams <dan.j.williams@intel.com>
Fri, 7 Oct 2016 23:46:30 +0000 (16:46 -0700)
commite476f94482fc20a23b7b33b3d8e50f1953f71828
tree8ac0e5812ea683b348bb70ba8c0d513e2a8f5739
parent178d6f4be8bf42b298bedf8ea2a00754100e0c4e
parent4e65e9381c7ac211ec2133e473fcbdd8656c779a
Merge branch 'for-4.9/dax' into libnvdimm-for-next
drivers/dax/dax.c
drivers/dax/pmem.c