Merge tag 'keys-misc-20160708' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowe...
authorJames Morris <james.l.morris@oracle.com>
Sat, 9 Jul 2016 02:49:00 +0000 (12:49 +1000)
committerJames Morris <james.l.morris@oracle.com>
Sat, 9 Jul 2016 02:49:00 +0000 (12:49 +1000)

Trivial merge