Merge commit 'tags/keys-fixes-20171018' into fixes-v4.14-rc5
authorJames Morris <james.l.morris@oracle.com>
Thu, 19 Oct 2017 01:28:38 +0000 (12:28 +1100)
committerJames Morris <james.l.morris@oracle.com>
Thu, 19 Oct 2017 01:28:38 +0000 (12:28 +1100)
commit494b9ae7abb84e6d88d7587906aff29dd26cf9d0
treeaeb24854a715777aaa9d433d57f5e45d05017f73
parent73d3393ada4f70fa3df5639c8d438f2f034c0ecb
parent68a1fdbbf8bd3378325e45c19e167a165f9ffc3a
Merge commit 'tags/keys-fixes-20171018' into fixes-v4.14-rc5