diff options
| author | David S. Miller <davem@davemloft.net> | 2017-11-04 03:26:51 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-11-04 03:26:51 +0300 |
| commit | 2a171788ba7bb61995e98e8163204fc7880f63b2 (patch) | |
| tree | 4150a94dd08323748116e5051e56ddee830d4812 /arch/xtensa/boot/dts | |
| parent | bf5345882bd18bc1b4966d170c0491ebe5c9a7d6 (diff) | |
| parent | d4c2e9fca5b7db8d315d93a072e65d0847f8e0c5 (diff) | |
| download | linux-2a171788ba7bb61995e98e8163204fc7880f63b2.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Files removed in 'net-next' had their license header updated
in 'net'. We take the remove from 'net-next'.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/xtensa/boot/dts')
| -rw-r--r-- | arch/xtensa/boot/dts/csp.dts | 1 | ||||
| -rw-r--r-- | arch/xtensa/boot/dts/kc705.dts | 1 | ||||
| -rw-r--r-- | arch/xtensa/boot/dts/kc705_nommu.dts | 1 | ||||
| -rw-r--r-- | arch/xtensa/boot/dts/lx200mx.dts | 1 | ||||
| -rw-r--r-- | arch/xtensa/boot/dts/lx60.dts | 1 | ||||
| -rw-r--r-- | arch/xtensa/boot/dts/ml605.dts | 1 | ||||
| -rw-r--r-- | arch/xtensa/boot/dts/xtfpga-flash-128m.dtsi | 1 | ||||
| -rw-r--r-- | arch/xtensa/boot/dts/xtfpga-flash-16m.dtsi | 1 | ||||
| -rw-r--r-- | arch/xtensa/boot/dts/xtfpga-flash-4m.dtsi | 1 | ||||
| -rw-r--r-- | arch/xtensa/boot/dts/xtfpga.dtsi | 1 |
10 files changed, 10 insertions, 0 deletions
diff --git a/arch/xtensa/boot/dts/csp.dts b/arch/xtensa/boot/dts/csp.dts index 4082f26716b9..885495460f7e 100644 --- a/arch/xtensa/boot/dts/csp.dts +++ b/arch/xtensa/boot/dts/csp.dts @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /dts-v1/; / { diff --git a/arch/xtensa/boot/dts/kc705.dts b/arch/xtensa/boot/dts/kc705.dts index 6106bdc097ad..6887ff090fce 100644 --- a/arch/xtensa/boot/dts/kc705.dts +++ b/arch/xtensa/boot/dts/kc705.dts @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /dts-v1/; /include/ "xtfpga.dtsi" /include/ "xtfpga-flash-128m.dtsi" diff --git a/arch/xtensa/boot/dts/kc705_nommu.dts b/arch/xtensa/boot/dts/kc705_nommu.dts index 65f3d741b964..d8e194a0f64e 100644 --- a/arch/xtensa/boot/dts/kc705_nommu.dts +++ b/arch/xtensa/boot/dts/kc705_nommu.dts @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /dts-v1/; /include/ "xtfpga.dtsi" /include/ "xtfpga-flash-128m.dtsi" diff --git a/arch/xtensa/boot/dts/lx200mx.dts b/arch/xtensa/boot/dts/lx200mx.dts index 249822b99bd6..974a8d9041b3 100644 --- a/arch/xtensa/boot/dts/lx200mx.dts +++ b/arch/xtensa/boot/dts/lx200mx.dts @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /dts-v1/; /include/ "xtfpga.dtsi" /include/ "xtfpga-flash-16m.dtsi" diff --git a/arch/xtensa/boot/dts/lx60.dts b/arch/xtensa/boot/dts/lx60.dts index a0f8b8ad3920..7c203c1c746a 100644 --- a/arch/xtensa/boot/dts/lx60.dts +++ b/arch/xtensa/boot/dts/lx60.dts @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /dts-v1/; /include/ "xtfpga.dtsi" /include/ "xtfpga-flash-4m.dtsi" diff --git a/arch/xtensa/boot/dts/ml605.dts b/arch/xtensa/boot/dts/ml605.dts index 905c3a5035e9..08e5c8d47197 100644 --- a/arch/xtensa/boot/dts/ml605.dts +++ b/arch/xtensa/boot/dts/ml605.dts @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /dts-v1/; /include/ "xtfpga.dtsi" /include/ "xtfpga-flash-16m.dtsi" diff --git a/arch/xtensa/boot/dts/xtfpga-flash-128m.dtsi b/arch/xtensa/boot/dts/xtfpga-flash-128m.dtsi index d3a88e029873..9bf8bad1dd18 100644 --- a/arch/xtensa/boot/dts/xtfpga-flash-128m.dtsi +++ b/arch/xtensa/boot/dts/xtfpga-flash-128m.dtsi @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 / { soc { flash: flash@00000000 { diff --git a/arch/xtensa/boot/dts/xtfpga-flash-16m.dtsi b/arch/xtensa/boot/dts/xtfpga-flash-16m.dtsi index 1d97203c18e7..40c2f81f7cb6 100644 --- a/arch/xtensa/boot/dts/xtfpga-flash-16m.dtsi +++ b/arch/xtensa/boot/dts/xtfpga-flash-16m.dtsi @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 / { soc { flash: flash@08000000 { diff --git a/arch/xtensa/boot/dts/xtfpga-flash-4m.dtsi b/arch/xtensa/boot/dts/xtfpga-flash-4m.dtsi index d1c621ca8be1..fb8d3a9f33c2 100644 --- a/arch/xtensa/boot/dts/xtfpga-flash-4m.dtsi +++ b/arch/xtensa/boot/dts/xtfpga-flash-4m.dtsi @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 / { soc { flash: flash@08000000 { diff --git a/arch/xtensa/boot/dts/xtfpga.dtsi b/arch/xtensa/boot/dts/xtfpga.dtsi index 91616a9d79df..1090528825ec 100644 --- a/arch/xtensa/boot/dts/xtfpga.dtsi +++ b/arch/xtensa/boot/dts/xtfpga.dtsi @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 / { compatible = "cdns,xtensa-xtfpga"; #address-cells = <1>; |