]> Pileus Git - ~andy/linux/commitdiff
Merge tag 'zynq-dt-for-3.14' of git://git.xilinx.com/linux-xlnx into next/dt
authorOlof Johansson <olof@lixom.net>
Sun, 22 Dec 2013 19:34:36 +0000 (11:34 -0800)
committerOlof Johansson <olof@lixom.net>
Sun, 22 Dec 2013 19:34:36 +0000 (11:34 -0800)
From Michal Simek:

arm: Xilinx Zynq dt patches for v3.14

- Add gem support
- Add cpus node
- TTC cleanup

* tag 'zynq-dt-for-3.14' of git://git.xilinx.com/linux-xlnx:
  arm: dt: zynq: Add 'cpus' node
  arm: dt: zynq: Remove 'clock-ranges' from TTC nodes
  ARM: zynq: add gem support

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

Trivial merge