Merge tag 'keys-next-20151021' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowe...
authorJames Morris <james.l.morris@oracle.com>
Fri, 23 Oct 2015 01:07:52 +0000 (12:07 +1100)
committerJames Morris <james.l.morris@oracle.com>
Fri, 23 Oct 2015 01:07:52 +0000 (12:07 +1100)

Trivial merge