Merge branch 'master' into next

This commit is contained in:
James Morris 2009-05-08 17:56:47 +10:00
commit d254117099
6181 changed files with 672645 additions and 214147 deletions

View file

@ -948,7 +948,6 @@ changed:
return commit_creds(new);
no_change:
error = 0;
error:
abort_creds(new);
return error;