]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'next/dt' into for-next
authorOlof Johansson <olof@lixom.net>
Mon, 26 May 2014 22:08:34 +0000 (15:08 -0700)
committerOlof Johansson <olof@lixom.net>
Mon, 26 May 2014 22:08:34 +0000 (15:08 -0700)
* next/dt:
  ARM: socfpga: dts: add watchdog0+1
  ARM: dts: socfpga: add gpio pieces


Trivial merge