From: Arnd Bergmann Date: Fri, 22 May 2015 15:16:20 +0000 (+0200) Subject: Merge tag 'v4.2-rockchip-dts2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind... X-Git-Tag: firefly_0821_release~176^2~1556^2~29 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=220684f3cd5198a02f232f3811d55380a375a9cb;p=firefly-linux-kernel-4.4.55.git Merge tag 'v4.2-rockchip-dts2' of git://git./linux/kernel/git/mmind/linux-rockchip into next/dt Merge "ARM: rockchip: dts relicensing for 4.2" from Heiko Stuebner: Relicense all Rockchip-related devicetree files to the GPL2/X11 combo. I've now finally aquired necessary Acks from all contributors. * tag 'v4.2-rockchip-dts2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: ARM: dts: rockchip: relicense rk3288-evb* under GPLv2/X11 ARM: dts: rockchip: relicense rk3288.dtsi under GPLv2/X11 ARM: dts: rockchip: relicense rk3188-radxarock.dts under GPLv2/X11 ARM: dts: rockchip: relicense rk3066a-bqcurie2.dts under GPLv2/X11 ARM: dts: rockchip: relicense rk3288-thermal.dtsi under GPLv2/X11 ARM: dts: rockchip: relicense rk3188.dtsi under GPLv2/X11 ARM: dts: rockchip: relicense rk3066a.dtsi under GPLv2/X11 ARM: dts: rockchip: relicense rk3xxx.dtsi under GPLv2/X11 --- 220684f3cd5198a02f232f3811d55380a375a9cb