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