]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
Merge branch 'for-4.14/fs' into libnvdimm-for-next
authorDan Williams <dan.j.williams@intel.com>
Thu, 31 Aug 2017 23:25:59 +0000 (16:25 -0700)
committerDan Williams <dan.j.williams@intel.com>
Thu, 31 Aug 2017 23:25:59 +0000 (16:25 -0700)
1  2 
arch/x86/Kconfig

Simple merge