Merge tag 'keys-fixes-20141201' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorJames Morris <james.l.morris@oracle.com>
Tue, 2 Dec 2014 07:06:12 +0000 (18:06 +1100)
committerJames Morris <james.l.morris@oracle.com>
Tue, 2 Dec 2014 07:06:12 +0000 (18:06 +1100)

Trivial merge