diff options
author | Ingo Molnar <mingo@kernel.org> | 2019-06-17 12:00:22 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2019-06-17 12:00:22 +0200 |
commit | 7b347ad4938ddca1a22b983e36b9ef825a72d230 (patch) | |
tree | 93b6262da516cda28465a8dc0c4a6a95525cbbd8 /include/linux/psci.h | |
parent | 9db9b76767f133d0e1ce19f01117c83221641899 (diff) | |
parent | 9e0babf2c06c73cda2c0cd37a1653d823adb40ec (diff) |
Merge tag 'v5.2-rc5' into x86/asm, to refresh the branch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/psci.h')
-rw-r--r-- | include/linux/psci.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/include/linux/psci.h b/include/linux/psci.h index 8b1b3b5935ab..a8a15613c157 100644 --- a/include/linux/psci.h +++ b/include/linux/psci.h @@ -1,12 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. * * Copyright (C) 2015 ARM Limited */ |