Merge branch 'keys-devel' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells...
authorJames Morris <james.l.morris@oracle.com>
Wed, 30 Oct 2013 22:46:36 +0000 (09:46 +1100)
committerJames Morris <james.l.morris@oracle.com>
Wed, 30 Oct 2013 22:46:36 +0000 (09:46 +1100)

Trivial merge