diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-06-17 12:06:34 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-06-17 12:06:34 +0200 |
| commit | 410df0c5748f6c5a53847d2acb163dc7cd8b6c51 (patch) | |
| tree | 0c0f547f90a73ec6d30851f93720e0eb24f353eb /arch/alpha | |
| parent | fff9b6c7d26943a8eb32b58364b7ec6b9369746a (diff) | |
| parent | 9e0babf2c06c73cda2c0cd37a1653d823adb40ec (diff) | |
Merge tag 'v5.2-rc5' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/alpha')
| -rw-r--r-- | arch/alpha/include/asm/device.h | 3 | ||||
| -rw-r--r-- | arch/alpha/kernel/srm_env.c | 18 |
2 files changed, 2 insertions, 19 deletions
diff --git a/arch/alpha/include/asm/device.h b/arch/alpha/include/asm/device.h index d8f9872b0e2d..9ca75a7db23e 100644 --- a/arch/alpha/include/asm/device.h +++ b/arch/alpha/include/asm/device.h @@ -1,7 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Arch specific extensions to struct device - * - * This file is released under the GPLv2 */ #include <asm-generic/device.h> diff --git a/arch/alpha/kernel/srm_env.c b/arch/alpha/kernel/srm_env.c index 705ae12acd15..7268222cf4e1 100644 --- a/arch/alpha/kernel/srm_env.c +++ b/arch/alpha/kernel/srm_env.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * srm_env.c - Access to SRM environment * variables through linux' procfs @@ -9,23 +10,6 @@ * <J.A.K.Mouw@its.tudelft.nl>. It is based on an idea * provided by DEC^WCompaq^WIntel's "Jumpstart" CD. They * included a patch like this as well. Thanks for idea! - * - * 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. - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place, - * Suite 330, Boston, MA 02111-1307 USA - * */ #include <linux/kernel.h> |