Merge tag 'keys-next-20140725' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowe...
authorJames Morris <james.l.morris@oracle.com>
Sat, 26 Jul 2014 00:38:59 +0000 (10:38 +1000)
committerJames Morris <james.l.morris@oracle.com>
Sat, 26 Jul 2014 00:38:59 +0000 (10:38 +1000)

Trivial merge