Merge tag 'keys-next-fixes-20150114' of git://git.kernel.org/pub/scm/linux/kernel...
authorJames Morris <james.l.morris@oracle.com>
Thu, 15 Jan 2015 00:30:54 +0000 (11:30 +1100)
committerJames Morris <james.l.morris@oracle.com>
Thu, 15 Jan 2015 00:30:54 +0000 (11:30 +1100)

Trivial merge