diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-06-03 11:50:18 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-06-03 11:50:18 +0200 |
| commit | 26b73da3604cc1a6596406d136b14d1a01c3676f (patch) | |
| tree | c7839809e35fce4868910742157e8ef96782b378 /arch/arm/mach-imx/pm-imx5.c | |
| parent | 5ca584d935c32906d114924dc0e1dbfcbb13fdb2 (diff) | |
| parent | f2c7c76c5d0a443053e94adb9f0918fa2fb85c3a (diff) | |
Merge tag 'v5.2-rc3' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/mach-imx/pm-imx5.c')
| -rw-r--r-- | arch/arm/mach-imx/pm-imx5.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/arch/arm/mach-imx/pm-imx5.c b/arch/arm/mach-imx/pm-imx5.c index 868781fd460c..f057df813f83 100644 --- a/arch/arm/mach-imx/pm-imx5.c +++ b/arch/arm/mach-imx/pm-imx5.c @@ -1,12 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2011 Freescale Semiconductor, Inc. All Rights Reserved. - * - * The code contained herein is licensed under the GNU General Public - * License. You may obtain a copy of the GNU General Public License - * Version 2 or later at the following locations: - * - * http://www.opensource.org/licenses/gpl-license.html - * http://www.gnu.org/copyleft/gpl.html */ #include <linux/suspend.h> #include <linux/clk.h> |