diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-10 23:45:05 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-10 23:45:05 +0100 |
commit | 64fd8c8a0ff421b47a879fbff5b82563b7fb82f5 (patch) | |
tree | 03e7230a36e641ad495cc4f6ceef6a5e848de4c0 /MAINTAINERS | |
parent | Fix alloc_node_mem_map() to work on ia64 again (diff) | |
parent | MAINTAINERS: update lpc18xx entry with more drivers (diff) | |
download | linux-64fd8c8a0ff421b47a879fbff5b82563b7fb82f5.tar.xz linux-64fd8c8a0ff421b47a879fbff5b82563b7fb82f5.zip |
Merge tag 'armsoc-fixes-nc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC non-urgent fixes from Olof Johansson:
"A handful of fixes that came in and didn't seem warranted to go in
through the 4.3-rc cycle.
- MAINTAINERS updates for one of the Broadcom platforms and lpc18xx
- A couple of non-critical Davinci bugfixes
- A fix to reset irq affinity for TI platforms (silences a warning at
reboot)"
* tag 'armsoc-fixes-nc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
MAINTAINERS: update lpc18xx entry with more drivers
soc: ti: reset irq affinity before freeing irq
ARM: cns3xxx: pci: avoid potential stack overflow
ARM: davinci: clock: Correct return values for API functions
ARM: davinci: re-use %*ph specifier
MAINTAINERS: add entry for the Broadcom Northstar Plus SoCs
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 8f10834124a9..bc93927db022 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1233,6 +1233,13 @@ ARM/LPC18XX ARCHITECTURE M: Joachim Eastwood <manabian@gmail.com> L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained +F: arch/arm/boot/dts/lpc43* +F: drivers/clk/nxp/clk-lpc18xx* +F: drivers/clocksource/time-lpc32xx.c +F: drivers/i2c/busses/i2c-lpc2k.c +F: drivers/memory/pl172.c +F: drivers/mtd/spi-nor/nxp-spifi.c +F: drivers/rtc/rtc-lpc24xx.c N: lpc18xx ARM/MAGICIAN MACHINE SUPPORT @@ -2388,19 +2395,27 @@ L: linux-scsi@vger.kernel.org S: Supported F: drivers/scsi/bnx2i/ -BROADCOM CYGNUS/IPROC ARM ARCHITECTURE +BROADCOM IPROC ARM ARCHITECTURE M: Ray Jui <rjui@broadcom.com> M: Scott Branden <sbranden@broadcom.com> +M: Jon Mason <jonmason@broadcom.com> L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) L: bcm-kernel-feedback-list@broadcom.com T: git git://github.com/broadcom/cygnus-linux.git S: Maintained N: iproc N: cygnus +N: nsp N: bcm9113* N: bcm9583* -N: bcm583* +N: bcm9585* +N: bcm9586* +N: bcm988312 N: bcm113* +N: bcm583* +N: bcm585* +N: bcm586* +N: bcm88312 BROADCOM BRCMSTB GPIO DRIVER M: Gregory Fong <gregory.0xf0@gmail.com> |