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)
commitd5ac992763d8de6c0ad6069df53a42f32a34c8b4
tree0a7f9925172796d0a02b9722b4dc79316c99f20b
parentc02ed2e75ef4c74e41e421acb4ef1494671585e8
parentb44327d198b4f1bbebaf83f714cde450471de644
Merge tag 'oxnas-arm-soc-for-4.12' of https://github.com/OXNAS/linux into next/fixes-non-critical

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