diff options
author | Mark Brown <broonie@kernel.org> | 2019-06-18 20:12:47 +0200 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2019-06-18 20:12:47 +0200 |
commit | e1d700f7c94e755106749411706a38e39a93404b (patch) | |
tree | b1230cb7eba5a4ef28ed2cd2527d9ac78f06cc00 /arch/powerpc/platforms/pseries/hotplug-cpu.c | |
parent | regulator: qcom_spmi: Refactor get_mode/set_mode (diff) | |
parent | Linux 5.2-rc4 (diff) | |
download | linux-e1d700f7c94e755106749411706a38e39a93404b.tar.xz linux-e1d700f7c94e755106749411706a38e39a93404b.zip |
Merge tag 'v5.2-rc4' into regulator-5.3
Linux 5.2-rc4
Diffstat (limited to 'arch/powerpc/platforms/pseries/hotplug-cpu.c')
-rw-r--r-- | arch/powerpc/platforms/pseries/hotplug-cpu.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/powerpc/platforms/pseries/hotplug-cpu.c b/arch/powerpc/platforms/pseries/hotplug-cpu.c index 97feb6e79f1a..bbda646b63b5 100644 --- a/arch/powerpc/platforms/pseries/hotplug-cpu.c +++ b/arch/powerpc/platforms/pseries/hotplug-cpu.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * pseries CPU Hotplug infrastructure. * @@ -11,11 +12,6 @@ * Plus various changes from other IBM teams... * * Copyright (C) 2006 Michael Ellerman, IBM Corporation - * - * 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; either version - * 2 of the License, or (at your option) any later version. */ #define pr_fmt(fmt) "pseries-hotplug-cpu: " fmt |