]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge tag 'zynq-dt-for-3.15' of git://git.xilinx.com/linux-xlnx into next/dt
authorOlof Johansson <olof@lixom.net>
Tue, 11 Mar 2014 21:21:28 +0000 (14:21 -0700)
committerOlof Johansson <olof@lixom.net>
Tue, 11 Mar 2014 21:21:43 +0000 (14:21 -0700)
Merge "arm: Xilinx Zynq dt patches for v3.15" from Michal Simek:

- Define fclk-enable property

* tag 'zynq-dt-for-3.15' of git://git.xilinx.com/linux-xlnx:
  arm: dt: zynq: Add fclk-enable property to clkc node

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

Trivial merge