Merge branch 'master' into next

2009-05-08 17:56:47 +10:00
parent 07ff7a0b18 8c9ed899b4
commit d254117099
6181 changed files with 672492 additions and 213994 deletions
--- a/security/commoncap.c
+++ b/security/commoncap.c
@@ -948,7 +948,6 @@ changed:
 	return commit_creds(new);

 no_change:
-	error = 0;
 error:
 	abort_creds(new);
 	return error;