tree 1fe96ab392c1ff203a6fb3f67ed0ed577056572e
parent b08dc3eba0c34027010caeda258f495074ae3a54
parent 6c30c53fd5ae6a99a23ad78e90c428d2c8ffb07f
author James Morris <jmorris@namei.org> 1250723922 +1000
committer James Morris <jmorris@namei.org> 1250723922 +1000

Merge branch 'master' into next

Conflicts:
	security/Kconfig

Manual fix.

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