From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 12 May 2015 15:05:39 +0000 (+0200)
Subject: Merge tag 'hip04-dt-for-4.2' of git://github.com/hisilicon/linux-hisi into next/dt
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=0b1480103f9dc1b590d29d6e9a7b29754e157536;p=linux-beck.git

Merge tag 'hip04-dt-for-4.2' of git://github.com/hisilicon/linux-hisi into next/dt

Merge "ARM: DT: Hisilicon hip04 soc and D01 board updates for 4.2" from Wei Xu:

- Add hip04 GPIO nodes
- Add NANDC nodes for hip04 and D01 board
- Add hip04 ethernet related nodes

* tag 'hip04-dt-for-4.2' of git://github.com/hisilicon/linux-hisi:
  ARM: dts: add HiSilicon hip04 ethernet controller resource
  mtd: hisilicon: add device tree node for NAND controller
  ARM: dts: hip04: add GPIO pieces
---

0b1480103f9dc1b590d29d6e9a7b29754e157536