]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1a7f447 ecda654)
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)
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


Trivial merge
Linux kernel for KaRo TX COM modules