Merge branch 'for-4.11/libnvdimm' into for-4.12/dax
authorDan Williams <dan.j.williams@intel.com>
Thu, 13 Apr 2017 04:59:01 +0000 (21:59 -0700)
committerDan Williams <dan.j.williams@intel.com>
Thu, 13 Apr 2017 04:59:01 +0000 (21:59 -0700)
commitbfca9acf1a5df0ff98fbf47e363adb48612bb7ec
treea50287c88fdc60a73912d205d7bce41b7af53827
parent92a3fa075d3d2716b9c662814540f1d660cbf2f5
parent11e63f6d920d6f2dfd3cd421e939a4aec9a58dcd
Merge branch 'for-4.11/libnvdimm' into for-4.12/dax
MAINTAINERS
drivers/dax/dax.c
drivers/hv/channel.c
drivers/hv/channel_mgmt.c
drivers/hv/hv_fcopy.c
drivers/hv/hv_kvp.c
drivers/hv/hv_snapshot.c
drivers/hv/vmbus_drv.c
include/linux/hyperv.h