From: Olof Johansson Date: Thu, 31 Jul 2014 05:40:49 +0000 (-0700) Subject: Merge tag 'v3.17-rockchip-rk3xxx-dts-2' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=cdf26ad472e972541f0d6c7d546c25f4c2d460a9;hp=-c;p=deliverable%2Flinux.git Merge tag 'v3.17-rockchip-rk3xxx-dts-2' of git://git./linux/kernel/git/mmind/linux-rockchip into next/dt Merge "two more dts changes for Rockchip Cortex-A9 SoCs" from Heiko Stübner: Watchdog nodes and a duplicate pinctrl property. * tag 'v3.17-rockchip-rk3xxx-dts-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: ARM: dts: rockchip: add watchdog node ARM: dts: rockchip: remove pinctrl setting from radxarock uart2 Signed-off-by: Olof Johansson --- cdf26ad472e972541f0d6c7d546c25f4c2d460a9