diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-05-12 15:03:34 (GMT) |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-05-12 15:03:34 (GMT) |
| commit | 3ef9866f2d645634cab65a5846e78fd27f69e2aa (patch) | |
| tree | e6976b3bacf0ac9bfb251772a433e4e83f3872a6 /arch/sh | |
| parent | 1a7f4473dd4d51736a8c99d7b5c050d88dcf7e9a (diff) | |
| parent | ecda6547d7e4410c00168abae56d6fa4271d0a7e (diff) | |
| download | linux-3ef9866f2d645634cab65a5846e78fd27f69e2aa.tar.xz | |
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
Diffstat (limited to 'arch/sh')
0 files changed, 0 insertions, 0 deletions