Merge tag 'keys-next-20140722' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowe...
authorJames Morris <james.l.morris@oracle.com>
Thu, 24 Jul 2014 11:36:19 +0000 (21:36 +1000)
committerJames Morris <james.l.morris@oracle.com>
Thu, 24 Jul 2014 11:36:19 +0000 (21:36 +1000)

Trivial merge