| commit | 87427db921c17e26748d3328d70c2300d9b15c05 | [log] [tgz] |
|---|---|---|
| author | Olof Johansson <olof@lixom.net> | Mon May 26 15:06:26 2014 -0700 |
| committer | Olof Johansson <olof@lixom.net> | Mon May 26 15:06:26 2014 -0700 |
| tree | deeb823910857a2a68a1edbb7087d2d0b3c60ced | |
| parent | 7f7bb3179de49b7454652ad821ee05ff60668bb8 [diff] | |
| parent | a98b60571938ed5cc79992dacb09460f15b6a175 [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>