diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-06-17 12:29:16 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-06-17 12:29:16 +0200 |
| commit | bddb3636737f658886a0a02b64db5366bba3428e (patch) | |
| tree | 8f7ffcb42803fa0bb3378ef969545e4a5e57262c /security/smack/smackfs.c | |
| parent | 3384c78631dd722c2cdc5c57fbdd39fc1b5a9f2d (diff) | |
| parent | cbb99c0f588737ec98c333558922ce47e9a95827 (diff) | |
Merge branch 'x86/cpu' into perf/core, to pick up dependent changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'security/smack/smackfs.c')
| -rw-r--r-- | security/smack/smackfs.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/security/smack/smackfs.c b/security/smack/smackfs.c index 47f73a0dabb1..ef0d8712d318 100644 --- a/security/smack/smackfs.c +++ b/security/smack/smackfs.c @@ -1,10 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) 2007 Casey Schaufler <casey@schaufler-ca.com> * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 2. - * * Authors: * Casey Schaufler <casey@schaufler-ca.com> * Ahmed S. Darwish <darwish.07@gmail.com> @@ -13,7 +10,6 @@ * * Karl MacMillan <kmacmillan@tresys.com> * James Morris <jmorris@redhat.com> - * */ #include <linux/kernel.h> |