Merge tag 'zynq-dt-for-3.17-2' of git://git.xilinx.com/linux-xlnx into next/dt
authorArnd Bergmann <arnd@arndb.de>
Wed, 23 Jul 2014 20:34:17 +0000 (22:34 +0200)
committerArnd Bergmann <arnd@arndb.de>
Wed, 23 Jul 2014 20:34:17 +0000 (22:34 +0200)
commit55be3cf836ff295efe8968710654a31e18b88a28
tree941e710dcbcdf6398c4140c0440a541c610564b8
parentf8a2a45320da54cbcb45ab8d1764a30059338eaf
parente0a5c552caf7a4865f3d5aa077003ef2d35217db
Merge tag 'zynq-dt-for-3.17-2' of git://git.xilinx.com/linux-xlnx into next/dt

Merge "arm: Xilinx Zynq dt patches for v3.17 second pull request" from Michal Simek:

- Add GPIO and XADC node to dtsi

* tag 'zynq-dt-for-3.17-2' of git://git.xilinx.com/linux-xlnx:
  ARM: zynq: DT: Add GPIO node
  ARM: zynq: DT: Add XADC node

Signed-off-by: Arnd Bergmann <arnd@arndb.de>