From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 29 May 2015 11:58:41 +0000 (+0200)
Subject: Merge tag 'zynq-dt-for-4.2' of https://github.com/Xilinx/linux-xlnx into next/dt
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=047d378a0075cc1559614270a1c9a5ce56b2a882;p=deliverable%2Flinux.git

Merge tag 'zynq-dt-for-4.2' of https://github.com/Xilinx/linux-xlnx into next/dt

Merge "arm: Xilinx Zynq dt patches for v4.2" from Michal Simek:

- Fix aliases and stdout properties
- Document current TTC binding
- Add Ceva to prefixes
- Use new compatible string for MACB

* tag 'zynq-dt-for-4.2' of https://github.com/Xilinx/linux-xlnx:
  ARM: zynq: DT: Use the zynq binding with macb
  of: Add vendor prefix for Ceva
  PCI: xilinx: Trivial fix in DT example
  devicetree: cadence_ttc: Document binding for timer width
  ARM: dts: zynq: Fix stdout-path and bootargs
  ARM: dts: zynq: Add missing alias node for zybo and parallella
---

047d378a0075cc1559614270a1c9a5ce56b2a882