Merge tag 'oxnas-arm-soc-dt-for-4.10' of https://github.com/OXNAS/linux into next/dt
authorArnd Bergmann <arnd@arndb.de>
Fri, 25 Nov 2016 22:59:15 +0000 (23:59 +0100)
committerArnd Bergmann <arnd@arndb.de>
Fri, 25 Nov 2016 22:59:15 +0000 (23:59 +0100)
Pull "ARM: OXNAS SoC DT updates for 4.10" from Neil Armstrong:

- Add DTSI for Oxford Semiconductor OX820
- Add DTS for Cloud Engines PogoPlug v3 board
- Fix MAINTAINERS Oxnas entry for dts files
from http://lkml.kernel.org/r/20161102141850.25164-1-narmstrong@baylibre.com

* tag 'oxnas-arm-soc-dt-for-4.10' of https://github.com/OXNAS/linux:
  MAINTAINERS: oxnas: Add new files definitions
  ARM: dts: Add support for OX820 and Pogoplug V3

1  2 
MAINTAINERS
arch/arm/boot/dts/Makefile

diff --cc MAINTAINERS
Simple merge
Simple merge