Skip to content
Commit 0d922f44 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'ox810se-arm-v4.6-rc3' of https://github.com/superna9999/linux into next/soc

Merge "ARM: Add OXNAS Platform Support" from Neil Armstrong

This is for the ARM926 based ox810 chip used in some older
NAS appliances. There is another related ox820 chip based on
ARM11 that might get added here later.

* tag 'ox810se-arm-v4.6-rc3' of https://github.com/superna9999/linux:
  MAINTAINERS: add maintainer entry for ARM/OXNAS platform
  ARM: Add new mach-oxnas
  irqchip: versatile-fpga: add new compatible for OX810SE SoC
parents 46a600ea e557959d
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment