projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
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>

Trivial merge