Merge branch 'security-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jj...
authorJames Morris <jmorris@namei.org>
Wed, 9 Mar 2011 03:12:07 +0000 (14:12 +1100)
committerJames Morris <jmorris@namei.org>
Wed, 9 Mar 2011 03:12:07 +0000 (14:12 +1100)

Trivial merge