Merge branch 'pmem-api' into libnvdimm-for-next
authorDan Williams <dan.j.williams@intel.com>
Thu, 27 Aug 2015 23:40:26 +0000 (19:40 -0400)
committerDan Williams <dan.j.williams@intel.com>
Thu, 27 Aug 2015 23:40:26 +0000 (19:40 -0400)
commit4a9bf88a5caa8495b5eb2b738d5fb40924bbc538
tree7c2901cb67a7dd7c863fee6924afe24be79cddab
parenta06a7576526e10a99ea7721533e7f2df3e26baad
parent67a3e8fe90156d41cd480d3dfbb40f3bc007c262
Merge branch 'pmem-api' into libnvdimm-for-next
arch/x86/Kconfig
tools/testing/nvdimm/Kbuild