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/exynos5250-spring.dts | |
parent | x86/cpufeature: Update _static_cpu_has() to use all named variables (diff) | |
parent | Merge tag 'nfsd-4.16' of git://linux-nfs.org/~bfields/linux (diff) | |
download | linux-7980033bea8a74692fdb987c44ec91b0be8e752b.tar.xz linux-7980033bea8a74692fdb987c44ec91b0be8e752b.zip |
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/exynos5250-spring.dts')
-rw-r--r-- | arch/arm/boot/dts/exynos5250-spring.dts | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/exynos5250-spring.dts b/arch/arm/boot/dts/exynos5250-spring.dts index 47dbc50546c1..3d501926c227 100644 --- a/arch/arm/boot/dts/exynos5250-spring.dts +++ b/arch/arm/boot/dts/exynos5250-spring.dts @@ -1,12 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Google Spring board device tree source * * Copyright (c) 2013 Google, Inc * Copyright (c) 2014 SUSE LINUX Products GmbH - * - * 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. */ /dts-v1/; |