Gitiles
Code Review Sign In
gerrit-public.fairphone.software / kernel / msm-4.9 / cdf26ad472e972541f0d6c7d546c25f4c2d460a9
commitcdf26ad472e972541f0d6c7d546c25f4c2d460a9[log] [tgz]
authorOlof Johansson <olof@lixom.net>Wed Jul 30 22:40:49 2014 -0700
committerOlof Johansson <olof@lixom.net>Wed Jul 30 22:40:49 2014 -0700
treef1a74381757ef4dcc0736c6d643cdb7f1b58ec84
parent68a05338ce3b1e4553524333b4c441f5fb7fb1ff [diff]
parenteb2b9d47dd907eba5d766d942723811393454346 [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>
tree: f1a74381757ef4dcc0736c6d643cdb7f1b58ec84
  1. arch/
  2. block/
  3. crypto/
  4. Documentation/
  5. drivers/
  6. firmware/
  7. fs/
  8. include/
  9. init/
  10. ipc/
  11. kernel/
  12. lib/
  13. mm/
  14. net/
  15. samples/
  16. scripts/
  17. security/
  18. sound/
  19. tools/
  20. usr/
  21. virt/
  22. .gitignore
  23. .mailmap
  24. COPYING
  25. CREDITS
  26. Kbuild
  27. Kconfig
  28. MAINTAINERS
  29. Makefile
  30. README
  31. REPORTING-BUGS