Merge tag 'keys-next-20140805' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowe...
authorJames Morris <james.l.morris@oracle.com>
Tue, 5 Aug 2014 14:52:01 +0000 (00:52 +1000)
committerJames Morris <james.l.morris@oracle.com>
Tue, 5 Aug 2014 14:52:01 +0000 (00:52 +1000)

Trivial merge