diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-09 09:20:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-09 09:20:16 -0700 |
| commit | e07e368b27c3470765b70f71279d18992c7d9e03 (patch) | |
| tree | d22aa4523475ae1dfb2a01470a53bcf4cabcfc9b /MAINTAINERS | |
| parent | 11fbf53d66ec302fe50b06bd7cb4863dbb98775a (diff) | |
| parent | c58ab5376a0f46fd3356786f4b146894df40f22b (diff) | |
| download | linux-e07e368b27c3470765b70f71279d18992c7d9e03.tar.gz linux-e07e368b27c3470765b70f71279d18992c7d9e03.tar.bz2 linux-e07e368b27c3470765b70f71279d18992c7d9e03.zip | |
Merge tag 'armsoc-fixes-nc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull misc ARM SoC fixes from Olof Johansson:
"ARM SoC non-urgent fixes for merge window
Smaller patches that didn't seem to find a home in other branches, and
low-priority fixes from late in the merge window. A number of these
are MAINTAINER updates, it seems.
Highlights:
* Maintainers:
- Remove Alexandre Courbot and Stephen Warren from Tegra
maintainership, add Jon Hunter
- Remove Stephen Warren and add Stefan Wahren to bcm2835
- Tweaks for file flagging for Marvell Dove
* Fixes:
- For two non-common-clk platform, handle clk_disable with NULL arg
- Remove redundant Kconfig select for Oxnas"
* tag 'armsoc-fixes-nc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
ARM: mmp: let clk_disable() return immediately if clk is NULL
ARM: w90x900: let clk_disable() return immediately if clk is NULL
MAINTAINERS: Add file patterns for dove device tree bindings
ARM: oxnas: remove redundant select CPU_V6K
MAINTAINERS: tegra: Remove self as maintainer
MAINTAINERS: tegra: Replace Stephen with Jon
MAINTAINERS: Add Stefan Wahren to bcm2835.
MAINTAINERS: remove swarren from bcm2835
MAINTAINERS: Add Jon Mason to BCM5301X maintainers
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index a4a9e31fed72..0244bbc76e7f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1497,6 +1497,7 @@ M: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> M: Gregory Clement <gregory.clement@free-electrons.com> L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained +F: Documentation/devicetree/bindings/soc/dove/ F: arch/arm/mach-dove/ F: arch/arm/mach-mv78xx0/ F: arch/arm/mach-orion5x/ @@ -2667,9 +2668,9 @@ N: kona F: arch/arm/mach-bcm/ BROADCOM BCM2835 ARM ARCHITECTURE -M: Stephen Warren <swarren@wwwdotorg.org> M: Lee Jones <lee@kernel.org> M: Eric Anholt <eric@anholt.net> +M: Stefan Wahren <stefan.wahren@i2se.com> L: linux-rpi-kernel@lists.infradead.org (moderated for non-subscribers) L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) T: git git://github.com/anholt/linux @@ -2689,12 +2690,14 @@ F: arch/mips/include/asm/mach-bcm47xx/* BROADCOM BCM5301X ARM ARCHITECTURE M: Hauke Mehrtens <hauke@hauke-m.de> M: Rafał Miłecki <zajec5@gmail.com> +M: Jon Mason <jonmason@broadcom.com> M: bcm-kernel-feedback-list@broadcom.com L: linux-arm-kernel@lists.infradead.org S: Maintained F: arch/arm/mach-bcm/bcm_5301x.c F: arch/arm/boot/dts/bcm5301x*.dtsi F: arch/arm/boot/dts/bcm470* +F: arch/arm/boot/dts/bcm953012* BROADCOM BCM53573 ARM ARCHITECTURE M: Rafał Miłecki <rafal@milecki.pl> @@ -12516,9 +12519,8 @@ S: Maintained F: drivers/media/rc/ttusbir.c TEGRA ARCHITECTURE SUPPORT -M: Stephen Warren <swarren@wwwdotorg.org> M: Thierry Reding <thierry.reding@gmail.com> -M: Alexandre Courbot <gnurou@gmail.com> +M: Jonathan Hunter <jonathanh@nvidia.com> L: linux-tegra@vger.kernel.org Q: http://patchwork.ozlabs.org/project/linux-tegra/list/ T: git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git |