]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'hip04-config-for-4.2' of git://github.com/hisilicon/linux-hisi into next...
authorArnd Bergmann <arnd@arndb.de>
Tue, 12 May 2015 15:03:34 +0000 (17:03 +0200)
committerArnd Bergmann <arnd@arndb.de>
Tue, 12 May 2015 15:03:34 +0000 (17:03 +0200)
commit0fe396c93650159c38d36432b19e52be482f1ac9
treee6976b3bacf0ac9bfb251772a433e4e83f3872a6
parent5dad687ae188a7111f56e7974544f85aa4099fb1
parentbcc9a08924c91c68f4a2212806e7aca8e25fbde2
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