projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 68a0533 eb2b9d4)
Merge tag 'v3.17-rockchip-rk3xxx-dts-2' of git://git.kernel.org/pub/scm/linux/kernel...
authorOlof Johansson <olof@lixom.net>
Thu, 31 Jul 2014 05:40:49 +0000 (22:40 -0700)
committerOlof Johansson <olof@lixom.net>
Thu, 31 Jul 2014 05:40:49 +0000 (22:40 -0700)
commitcdf26ad472e972541f0d6c7d546c25f4c2d460a9
treef1a74381757ef4dcc0736c6d643cdb7f1b58ec84tree | snapshot (tar.gz zip)
parent68a05338ce3b1e4553524333b4c441f5fb7fb1ffcommit | diff
parenteb2b9d47dd907eba5d766d942723811393454346commit | diff
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 <olof@lixom.net>