Merge tag 'keys-fixes-20160412' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorJames Morris <james.l.morris@oracle.com>
Wed, 13 Apr 2016 01:06:52 +0000 (11:06 +1000)
committerJames Morris <james.l.morris@oracle.com>
Wed, 13 Apr 2016 01:06:52 +0000 (11:06 +1000)

Trivial merge