diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-17 16:18:22 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-17 16:18:28 +0200 |
| commit | 5043124e660fcc3ddefe4239ddfa017bf13f5081 (patch) | |
| tree | 06875cdb942afe460dbac33acf3e8223c805a35d /security/commoncap.c | |
| parent | 77857dc07247ed5fa700a197c96ef842d8dbebdf (diff) | |
| parent | 9f76208c33984ab777eace5d07a4e36e88703e02 (diff) | |
Merge branch 'linus' into x86/apic
Merge reason: new intr-remap patches depend on the s2ram iommu fixes from upstream
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 7cd61a5f5205..beac0258c2a8 100644 --- a/security/commoncap.c +++ b/security/commoncap.c @@ -916,7 +916,6 @@ changed: return commit_creds(new); no_change: - error = 0; error: abort_creds(new); return error; |