diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-03 08:25:25 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-03 08:25:25 +0300 |
| commit | 119a7fdfeecefa5a4062256ac2dcd3b69eaa8414 (patch) | |
| tree | 40d834b32ce97857f3f974c95b64b6b48d415e6e /arch/arm/mach-imx/mach-imx51.c | |
| parent | 086ebf92aa791b6cc8805decffca7b8898d99a4e (diff) | |
| parent | f2c7c76c5d0a443053e94adb9f0918fa2fb85c3a (diff) | |
| download | linux-119a7fdfeecefa5a4062256ac2dcd3b69eaa8414.tar.xz | |
Merge 5.2-rc3 into usb-next
we want the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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> |