forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'armsoc-fixes-nc' of git://git.kernel.org/pub/scm/linux/ker…
…nel/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
- Loading branch information
Showing
4 changed files
with
11 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1497,6 +1497,7 @@ M: Sebastian Hesselbarth <[email protected]> | |
M: Gregory Clement <[email protected]> | ||
L: [email protected] (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 <[email protected]> | ||
M: Lee Jones <[email protected]> | ||
M: Eric Anholt <[email protected]> | ||
M: Stefan Wahren <[email protected]> | ||
L: [email protected] (moderated for non-subscribers) | ||
L: [email protected] (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 <[email protected]> | ||
M: Rafał Miłecki <[email protected]> | ||
M: Jon Mason <[email protected]> | ||
M: [email protected] | ||
L: [email protected] | ||
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 <[email protected]> | ||
|
@@ -12516,9 +12519,8 @@ S: Maintained | |
F: drivers/media/rc/ttusbir.c | ||
|
||
TEGRA ARCHITECTURE SUPPORT | ||
M: Stephen Warren <[email protected]> | ||
M: Thierry Reding <[email protected]> | ||
M: Alexandre Courbot <gnurou@gmail.com> | ||
M: Jonathan Hunter <jonathanh@nvidia.com> | ||
L: [email protected] | ||
Q: http://patchwork.ozlabs.org/project/linux-tegra/list/ | ||
T: git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters