Merge tag 'for_3.15/dts_signed' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorTony Lindgren <tony@atomide.com>
Sun, 2 Mar 2014 22:22:03 +0000 (14:22 -0800)
committerTony Lindgren <tony@atomide.com>
Sun, 2 Mar 2014 22:22:03 +0000 (14:22 -0800)
commitf777ba1780584b100ab9664cc06d04f3bb273a84
tree865813eb0078530ca3b036c0c3eee6ce33f9315f
parentf68e355c86cff91e5266cf937ea24fcba0641900
parent1a5fe3ca5ea192d4309dd61f3626b79ff38693c2
Merge tag 'for_3.15/dts_signed' of git://git./linux/kernel/git/bcousson/linux-omap-dt into omap-for-v3.15/dt

Add craneboard devices
Add more N900 devices
Add am43x-epos-evm and am437x-gp-evm devices
Add OMAP4 DMM devices

Conflicts:
arch/arm/boot/dts/am43x-epos-evm.dts
arch/arm/boot/dts/dra7.dtsi
arch/arm/boot/dts/Makefile
arch/arm/boot/dts/am4372.dtsi
arch/arm/boot/dts/am43x-epos-evm.dts
arch/arm/boot/dts/dra7.dtsi
arch/arm/boot/dts/omap3430-sdp.dts
arch/arm/boot/dts/omap4.dtsi
arch/arm/boot/dts/omap5.dtsi