diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2019-06-25 01:32:59 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2019-06-25 01:32:59 +0200 |
| commit | 1c5ba67d2277ac2faf37c61076e8b5fa312be492 (patch) | |
| tree | a645a1a2f7aea7faafcd67c6ba1bfd424b95cd7d /arch/arm/boot/dts/spear320.dtsi | |
| parent | dbb5281a1f84b2f93032d4864c211ce8a20811a7 (diff) | |
| parent | 045df37e743c7448931131988e99e8fe0cc92a54 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
Resolve conflict between d2912cb15bdd ("treewide: Replace GPLv2
boilerplate/reference with SPDX - rule 500") removing the GPL disclaimer
and fe03d4745675 ("Update my email address") which updates Jozsef
Kadlecsik's email.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'arch/arm/boot/dts/spear320.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/spear320.dtsi | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/arch/arm/boot/dts/spear320.dtsi b/arch/arm/boot/dts/spear320.dtsi index 22be6e5edaac..3bc1e93a0a55 100644 --- a/arch/arm/boot/dts/spear320.dtsi +++ b/arch/arm/boot/dts/spear320.dtsi @@ -1,14 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * DTS file for SPEAr320 SoC * * Copyright 2012 Viresh Kumar <vireshk@kernel.org> - * - * 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/ "spear3xx.dtsi" |