projects / cascardo / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 178d6f4 4e65e93)
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)
1  2 
drivers/dax/dax.c patch | diff1 | diff2 | blob | history
drivers/dax/pmem.c patch | diff1 | diff2 | blob | history

diff --cc drivers/dax/dax.c
Simple merge
diff --cc drivers/dax/pmem.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.