]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c02ed2e b44327d)
Merge tag 'oxnas-arm-soc-for-4.12' of https://github.com/OXNAS/linux into next/fixes...
authorArnd Bergmann <arnd@arndb.de>
Thu, 30 Mar 2017 15:00:34 +0000 (17:00 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 30 Mar 2017 15:00:34 +0000 (17:00 +0200)
Pull "ARM: OXNAS SoC update for 4.12" from Neil Armstrong:

- Fix OX820 Kconfig

* tag 'oxnas-arm-soc-for-4.12' of https://github.com/OXNAS/linux:
  ARM: oxnas: remove redundant select CPU_V6K


Trivial merge
Linux kernel for KaRo TX COM modules