projects / cascardo / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a06a757 67a3e8f)
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)
1  2 
arch/x86/Kconfig patch | diff1 | diff2 | blob | history
tools/testing/nvdimm/Kbuild patch | diff1 | diff2 | blob | history

diff --cc arch/x86/Kconfig
Simple merge
diff --cc tools/testing/nvdimm/Kbuild
Simple merge
Unnamed repository; edit this file 'description' to name the repository.