Merge tag 'v4.2-rockchip-dts2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind...
authorArnd Bergmann <arnd@arndb.de>
Fri, 22 May 2015 15:16:20 +0000 (17:16 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 22 May 2015 15:16:20 +0000 (17:16 +0200)
commit220684f3cd5198a02f232f3811d55380a375a9cb
tree82fe0e4ef62e576231cc6fbed5ebea25f3bccc2b
parent54458fb7fa8a1f2a83b41b493be108f89f692388
parentcdcc8b6b241912fe0fd60e447453d87c644b1619
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