]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f8a2a45 e0a5c55)
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)
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>

Trivial merge
local clone of linux.git