diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-11-25 23:59:15 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-11-25 23:59:15 +0100 |
| commit | 7677796fe69363956730a9cd5262122a0b3d305d (patch) | |
| tree | 74bbd35f686b7d8b8f66fe49561f78e8b312cb0f /MAINTAINERS | |
| parent | 254172cc7a9c3790967fc0a7c470bd431bde62fc (diff) | |
| parent | 52c468fb37b663e0826f2bbdea61095bdd4e4b54 (diff) | |
| download | linux-7677796fe69363956730a9cd5262122a0b3d305d.tar.gz linux-7677796fe69363956730a9cd5262122a0b3d305d.tar.bz2 linux-7677796fe69363956730a9cd5262122a0b3d305d.zip | |
Merge tag 'oxnas-arm-soc-dt-for-4.10' of https://github.com/OXNAS/linux into next/dt
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
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index f3b711b1e00d..b4e472a159ee 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1479,8 +1479,9 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) L: linux-oxnas@lists.tuxfamily.org (moderated for non-subscribers) S: Maintained F: arch/arm/mach-oxnas/ -F: arch/arm/boot/dts/oxnas* +F: arch/arm/boot/dts/ox8*.dtsi F: arch/arm/boot/dts/wd-mbwe.dts +F: arch/arm/boot/dts/cloudengines-pogoplug-series-3.dts N: oxnas ARM/Mediatek RTC DRIVER |