Merge tag 'ox810se-arm-v4.6-rc3' of https://github.com/superna9999/linux into next/soc
authorArnd Bergmann <arnd@arndb.de>
Tue, 26 Apr 2016 11:13:34 +0000 (13:13 +0200)
committerArnd Bergmann <arnd@arndb.de>
Tue, 26 Apr 2016 11:13:34 +0000 (13:13 +0200)
commit0d922f441dadf054ad707c6000ce0797d291fb52
treeb32572313c39137ffeac6ac1020ee8f3ae30244e
parent46a600eac9984037e027da4225f9b36d3f106da5
parente557959d5599037899dd974f4a79419c664dcf79
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
MAINTAINERS
arch/arm/Kconfig