diff options
author | Ingo Molnar <mingo@kernel.org> | 2018-02-11 11:33:33 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2018-02-11 11:33:33 +0100 |
commit | 7980033bea8a74692fdb987c44ec91b0be8e752b (patch) | |
tree | 02b57329465d397b3a20468a683e56d1cda88cf6 /arch/arm/boot/dts/s3c64xx.dtsi | |
parent | 3197b04bb39b596613ff2f8143c5cd0a6908debf (diff) | |
parent | f1517df8701c9f12dae9ce7f43a5d300a6917619 (diff) | |
download | linux-7980033bea8a74692fdb987c44ec91b0be8e752b.tar.bz2 |
Merge branch 'linus' into x86/urgent, to pick up dependent commits
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/boot/dts/s3c64xx.dtsi')
-rw-r--r-- | arch/arm/boot/dts/s3c64xx.dtsi | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/s3c64xx.dtsi b/arch/arm/boot/dts/s3c64xx.dtsi index c55cbb3af2c0..e2be3fbdd3f3 100644 --- a/arch/arm/boot/dts/s3c64xx.dtsi +++ b/arch/arm/boot/dts/s3c64xx.dtsi @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Samsung's S3C64xx SoC series common device tree source * @@ -10,10 +11,6 @@ * Note: This file does not include device nodes for all the controllers in * S3C64xx SoCs. As device tree coverage for S3C64xx increases, additional * nodes can be added to this file. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. */ #include "skeleton.dtsi" |