From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 12 May 2015 15:03:34 +0000 (+0200)
Subject: Merge tag 'hip04-config-for-4.2' of git://github.com/hisilicon/linux-hisi into next... 
X-Git-Tag: v4.2-rc1~97^2~39
X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=3ef9866f2d645634cab65a5846e78fd27f69e2aa;p=karo-tx-linux.git

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

Merge "ARM: HIP04: configure updates for 4.2" from Wei Xu:

- Enable ethernet on hip04 SoC
- Enable Sysnopsis GPIO controller on hip04 SoC

* tag 'hip04-config-for-4.2' of git://github.com/hisilicon/linux-hisi:
  ARM: defconfig: hisi: enable HiSilicon hip04 ethernet controller
  ARM: hip04: add GPIO configure in hisi_defconfig
---

3ef9866f2d645634cab65a5846e78fd27f69e2aa