Merge tag 'keys-next-20160505' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowe...
authorJames Morris <james.l.morris@oracle.com>
Thu, 5 May 2016 23:29:00 +0000 (09:29 +1000)
committerJames Morris <james.l.morris@oracle.com>
Thu, 5 May 2016 23:29:00 +0000 (09:29 +1000)

Trivial merge