| commit | 0b1480103f9dc1b590d29d6e9a7b29754e157536 | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Tue May 12 17:05:39 2015 +0200 |
| committer | Arnd Bergmann <arnd@arndb.de> | Tue May 12 17:05:39 2015 +0200 |
| tree | e3b12f9e95ebdf69fc13ec9e9835922ab8ebd274 | |
| parent | 8e678e06e7d4926a4b3427359a6b13ab4b6dce73 [diff] | |
| parent | 9fac45c16c33f9f822ed7f9b9660890f68f16d8b [diff] |
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