From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 26 Apr 2016 11:13:34 +0000 (+0200)
Subject: Merge tag 'ox810se-arm-v4.6-rc3' of https://github.com/superna9999/linux into next/soc
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=0d922f441dadf054ad707c6000ce0797d291fb52;p=linux-beck.git

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
---

0d922f441dadf054ad707c6000ce0797d291fb52