Merge branch 'for-4.6/pfn' into libnvdimm-for-next
commit489011652a2d5555901def04c24d68874e8ba9a1
authorDan Williams <dan.j.williams@intel.com>
Thu, 10 Mar 2016 01:15:43 +0000 (9 17:15 -0800)
committerDan Williams <dan.j.williams@intel.com>
Thu, 10 Mar 2016 01:15:43 +0000 (9 17:15 -0800)
treef4d000e5ae63350016d12e6ccb52b0809bb814df
parent59e6473980f321c16299e12db69d1fabc2644a6f
parentff8e92d5d94b99aab39f439d532cba435947dfc0
Merge branch 'for-4.6/pfn' into libnvdimm-for-next
drivers/acpi/nfit.c
drivers/nvdimm/pmem.c