diff options
author | Mark Brown <broonie@kernel.org> | 2019-06-26 12:39:34 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2019-06-26 12:39:34 +0100 |
commit | 53c8b29abe42e5601cfa0ea5962532f0cfdec8a0 (patch) | |
tree | cad53f42ce7a03c39a984bcdbcc42cd47f1af6f9 /arch/arm/mach-imx/mach-imx51.c | |
parent | e3303268f9cfa4eb7c2217df471417d4327109fd (diff) | |
parent | 4b972a01a7da614b4796475f933094751a295a2f (diff) | |
download | talos-op-linux-53c8b29abe42e5601cfa0ea5962532f0cfdec8a0.tar.gz talos-op-linux-53c8b29abe42e5601cfa0ea5962532f0cfdec8a0.zip |
Merge tag 'v5.2-rc6' into asoc-5.3
Linux 5.2-rc6
Diffstat (limited to 'arch/arm/mach-imx/mach-imx51.c')
-rw-r--r-- | arch/arm/mach-imx/mach-imx51.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/arch/arm/mach-imx/mach-imx51.c b/arch/arm/mach-imx/mach-imx51.c index 08c7892866c2..8b748a1854d7 100644 --- a/arch/arm/mach-imx/mach-imx51.c +++ b/arch/arm/mach-imx/mach-imx51.c @@ -1,13 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2011 Freescale Semiconductor, Inc. All Rights Reserved. * Copyright 2011 Linaro Ltd. - * - * 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/io.h> |