From: Arnd Bergmann <arnd@arndb.de>
Date: Wed, 23 Jul 2014 20:34:17 +0000 (+0200)
Subject: Merge tag 'zynq-dt-for-3.17-2' of git://git.xilinx.com/linux-xlnx into next/dt
X-Git-Tag: v3.17-rc1~77^2~13
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=55be3cf836ff295efe8968710654a31e18b88a28;p=linux.git

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>
---

55be3cf836ff295efe8968710654a31e18b88a28