diff options
| author | Mark Brown <broonie@kernel.org> | 2019-06-26 14:39:34 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-06-26 14:39:34 +0300 |
| commit | 53c8b29abe42e5601cfa0ea5962532f0cfdec8a0 (patch) | |
| tree | cad53f42ce7a03c39a984bcdbcc42cd47f1af6f9 /arch/arm/mach-ux500/pm.c | |
| parent | e3303268f9cfa4eb7c2217df471417d4327109fd (diff) | |
| parent | 4b972a01a7da614b4796475f933094751a295a2f (diff) | |
| download | linux-53c8b29abe42e5601cfa0ea5962532f0cfdec8a0.tar.xz | |
Merge tag 'v5.2-rc6' into asoc-5.3
Linux 5.2-rc6
Diffstat (limited to 'arch/arm/mach-ux500/pm.c')
| -rw-r--r-- | arch/arm/mach-ux500/pm.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mach-ux500/pm.c b/arch/arm/mach-ux500/pm.c index f6c33a0c1c61..ff9c375e4277 100644 --- a/arch/arm/mach-ux500/pm.c +++ b/arch/arm/mach-ux500/pm.c @@ -1,12 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (C) ST-Ericsson SA 2010-2013 * Author: Rickard Andersson <rickard.andersson@stericsson.com> for * ST-Ericsson. * Author: Daniel Lezcano <daniel.lezcano@linaro.org> for Linaro. * Author: Ulf Hansson <ulf.hansson@linaro.org> for Linaro. - * - * License terms: GNU General Public License (GPL) version 2 - * */ #include <linux/kernel.h> |