projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7f7bb31 a98b605)
Merge tag 'socfpga_dt_updates-for-3.16_take_2_version_2' of git://git.rocketboards...
authorOlof Johansson <olof@lixom.net>
Mon, 26 May 2014 22:06:26 +0000 (15:06 -0700)
committerOlof Johansson <olof@lixom.net>
Mon, 26 May 2014 22:06:26 +0000 (15:06 -0700)
commit87427db921c17e26748d3328d70c2300d9b15c05
treedeeb823910857a2a68a1edbb7087d2d0b3c60cedtree | snapshot (tar.gz zip)
parent7f7bb3179de49b7454652ad821ee05ff60668bb8commit | diff
parenta98b60571938ed5cc79992dacb09460f15b6a175commit | diff
Merge tag 'socfpga_dt_updates-for-3.16_take_2_version_2' of git://git.rocketboards.org/linux-socfpga-next into next/dt

Merge "SOCFPGA DTS updates for 3.16, take 2-version 2" from Dinh Nguyen:

Add the gpio and watchdog dts entries for the SOCFPGA platform.

* tag 'socfpga_dt_updates-for-3.16_take_2_version_2' of git://git.rocketboards.org/linux-socfpga-next:
  ARM: socfpga: dts: add watchdog0+1
  ARM: dts: socfpga: add gpio pieces

Signed-off-by: Olof Johansson <olof@lixom.net>