diff options
| author | Olof Johansson <olof@lixom.net> | 2014-07-30 22:40:49 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-07-30 22:40:49 -0700 |
| commit | cdf26ad472e972541f0d6c7d546c25f4c2d460a9 (patch) | |
| tree | f1a74381757ef4dcc0736c6d643cdb7f1b58ec84 /arch/arm/boot/dts/omap4.dtsi | |
| parent | 68a05338ce3b1e4553524333b4c441f5fb7fb1ff (diff) | |
| parent | eb2b9d47dd907eba5d766d942723811393454346 (diff) | |
Merge tag 'v3.17-rockchip-rk3xxx-dts-2' of git://git.kernel.org/pub/scm/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 <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/omap4.dtsi')
0 files changed, 0 insertions, 0 deletions