Merge remote-tracking branch 'alioth/master'

debian/copyright

@@ -22,7 +22,44 @@ Copyright: 2011 Lennart Poettering
 License: LGPL-2.1
 
 Files:
- arch/arm/boot/dts/armada-370-*.dts* (except arch/arm/boot/dts/armada-370-seagate-*)
+ arch/arm/boot/dts/armada-370.dtsi
+ arch/arm/boot/dts/armada-370-d*.dts*
+ arch/arm/boot/dts/armada-370-mirabox.dts
+ arch/arm/boot/dts/armada-370-netgear*.dts*
+ arch/arm/boot/dts/armada-370-rd.dts
+ arch/arm/boot/dts/armada-370-synology-ds213j.dts
+ arch/arm/boot/dts/armada-375*.dts*
+ arch/arm/boot/dts/armada-38*.dts*
+ arch/arm/boot/dts/armada-39*.dts*
+ arch/arm/boot/dts/armada-xp*.dts*
+ arch/arm/boot/dts/artpec6.dtsi
+ arch/arm/boot/dts/at91sam9260ek.dts
+ arch/arm/boot/dts/at91sam9xe.dtsi
+ arch/arm/boot/dts/axp*.dts*
+ arch/arm/boot/dts/berlin2*.dts*
+ arch/arm/boot/dts/cros-ec-sbs.dtsi
+ arch/arm/boot/dts/cx92755*.dts*
+ arch/arm/boot/dts/imx7*.dts*
+ arch/arm/boot/dts/kirkwood-linkstation*.dts*
+ arch/arm/boot/dts/ls*.dts*
+ arch/arm/boot/dts/meson*.dts*
+ arch/arm/boot/dts/mps2*.dts*
+ arch/arm/boot/dts/mvebu-linkstation-*.dts*
+ arch/arm/boot/dts/orion5x-kuroboxpro.dts
+ arch/arm/boot/dts/orion5x-linkstation*.dts*
+ arch/arm/boot/dts/orion5x-ls*.dts*
+ arch/arm/boot/dts/qcom-mdm9615*.dts*
+ arch/arm/boot/dts/rk*.dts
+ arch/arm/boot/dts/sama5d2.dtsi
+ arch/arm/boot/dts/sama5d4.dtsi
+ arch/arm/boot/dts/socfpga_cyclone5_vining_fpga.dts
+ arch/arm/boot/dts/stm*.dts*
+ arch/arm/boot/dts/sun*.dts*
+ arch/arm/boot/dts/tegra124-apalis*.dts*
+ arch/arm/boot/dts/uniphier-*.dts*
+ arch/arm/boot/dts/vf610-colibri*.dts*
+ arch/arm/boot/dts/vf610m*.dts*
+ arch/arm64/boot/dts/allwinner/*.dts*
  arch/arm64/boot/dts/amlogic/*.dts*
  arch/arm64/boot/dts/cavium/thunder-*.dts*
  arch/arm64/boot/dts/freescale/fsl-*.dts*
@@ -36,7 +73,7 @@ Files:
  include/dt-bindings/dma/sun4i-a10.h
  include/dt-bindings/pinctrl/sun4i-a10.h
  include/dt-bindings/reset/sun*.h
-License: GPL-3+ or X11 Dual License
+License: GPL-2+ or X11 Dual License
 
 Files: drivers/crypto/vmx/*.pl
 Copyright: 2006,2014 Andy Polyakov <appro@openssl.org>
@@ -180,7 +217,7 @@ License: LGPL-2.1
  On Debian systems, the complete text of the GNU Lesser General Public
  License version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1'.
 
-License: GPL-3+ or X11 Dual License
+License: GPL-2+ or X11 Dual License
  This file is dual-licensed: you can use it either under the terms
  of the GPL or the X11 license, at your option. Note that this dual
  licensing only applies to this file, and not this project as a