Merge tag 'keys-next-20140922' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowe...
authorJames Morris <james.l.morris@oracle.com>
Mon, 22 Sep 2014 12:54:56 +0000 (22:54 +1000)
committerJames Morris <james.l.morris@oracle.com>
Mon, 22 Sep 2014 12:54:56 +0000 (22:54 +1000)

Trivial merge