Merge branch 'master' into next
authorJames Morris <jmorris@namei.org>
Wed, 19 Aug 2009 23:18:42 +0000 (09:18 +1000)
committerJames Morris <jmorris@namei.org>
Wed, 19 Aug 2009 23:18:42 +0000 (09:18 +1000)
Conflicts:
security/Kconfig

Manual fix.

Signed-off-by: James Morris <jmorris@namei.org>

Trivial merge