Merge branch 'security-next-keys' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorJames Morris <james.l.morris@oracle.com>
Wed, 3 Oct 2012 03:00:17 +0000 (13:00 +1000)
committerJames Morris <james.l.morris@oracle.com>
Wed, 3 Oct 2012 03:00:17 +0000 (13:00 +1000)
As requested by David.


Trivial merge