Merge branch 'for-4.5/block-dax' into for-4.5/libnvdimm
authorDan Williams <dan.j.williams@intel.com>
Sun, 10 Jan 2016 15:53:55 +0000 (07:53 -0800)
committerDan Williams <dan.j.williams@intel.com>
Sun, 10 Jan 2016 15:53:55 +0000 (07:53 -0800)
commit8b63b6bfc1a551acf154061699028c7032d7890c
tree16882e9bc9e35eacb870a6d8a71617e579c4ffdc
parente07ecd76d4db7bda1e9495395b2110a3fe28845a
parent55f5560d8c18fe33fc169f8d244a9247dcac7612
Merge branch 'for-4.5/block-dax' into for-4.5/libnvdimm
drivers/nvdimm/nd-core.h
drivers/nvdimm/nd.h
drivers/nvdimm/pmem.c