diff options
| author | James Morris | 2009-05-08 09:56:47 +0200 |
|---|---|---|
| committer | James Morris | 2009-05-08 09:56:47 +0200 |
| commit | d254117099d711f215e62427f55dfb8ebd5ad011 (patch) | |
| tree | 0848ff8dd74314fec14a86497f8d288c86ba7c65 /security/commoncap.c | |
| parent | integrity: remove __setup auditing msgs (diff) | |
| parent | NOMMU: Don't check vm_region::vm_start is page aligned in add_nommu_region() (diff) | |
| download | kernel-qcow2-linux-d254117099d711f215e62427f55dfb8ebd5ad011.tar.gz kernel-qcow2-linux-d254117099d711f215e62427f55dfb8ebd5ad011.tar.xz kernel-qcow2-linux-d254117099d711f215e62427f55dfb8ebd5ad011.zip | |
Merge branch 'master' into next
Diffstat (limited to 'security/commoncap.c')
| -rw-r--r-- | security/commoncap.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/security/commoncap.c b/security/commoncap.c index 97ac1f167717..48b7e0228fa3 100644 --- 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; |