Merge tag 'keys-next-20150123' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowe...
authorJames Morris <james.l.morris@oracle.com>
Thu, 29 Jan 2015 00:03:24 +0000 (11:03 +1100)
committerJames Morris <james.l.morris@oracle.com>
Thu, 29 Jan 2015 00:03:24 +0000 (11:03 +1100)

Trivial merge