diff options
| author | David S. Miller <davem@davemloft.net> | 2019-06-07 20:00:14 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-06-07 20:00:14 +0200 |
| commit | a6cdeeb16bff89c8486324f53577db058cbe81ba (patch) | |
| tree | de2d38e10f5768bdf1d2902112a4803d0ae767f3 /arch/arm/boot/dts/imx28-apf28.dts | |
| parent | Merge branch 'Xilinx-axienet-driver-updates' (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-a6cdeeb16bff89c8486324f53577db058cbe81ba.tar.xz linux-a6cdeeb16bff89c8486324f53577db058cbe81ba.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Some ISDN files that got removed in net-next had some changes
done in mainline, take the removals.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/arm/boot/dts/imx28-apf28.dts')
| -rw-r--r-- | arch/arm/boot/dts/imx28-apf28.dts | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/arch/arm/boot/dts/imx28-apf28.dts b/arch/arm/boot/dts/imx28-apf28.dts index b6976fbec983..3ed2b328f7ef 100644 --- a/arch/arm/boot/dts/imx28-apf28.dts +++ b/arch/arm/boot/dts/imx28-apf28.dts @@ -1,12 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright 2012 Armadeus Systems - <support@armadeus.com> - * - * 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 */ /dts-v1/; |