diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-17 12:15:46 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-17 12:15:46 -0500 |
commit | 4025fa97ff39db054b47b9cdb9f3980480637668 (patch) | |
tree | 1be796bfa9b2d7f8b6f9a05034f9cede3eb28e8d /MAINTAINERS | |
parent | c397f8fa4379040bada53256c848e62c8b060392 (diff) | |
parent | 11fe05de8b73816b7d12309ae55ca61c531c4e06 (diff) |
Merge tag 'fixes-non-critical-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC non-critical fixes from Olof Johansson:
"Here's a small collection of fixes accrued during the last release
that weren't considered severe enough to merge during the -rc series.
A few of these are around resurrecting TI81xx support that's been
broken for quite a while, the rest are smaller fixes -- most for PXA
but a few across the board.
There are also some updates to MAINTAINERS here, in particular for
Broadcom platforms"
* tag 'fixes-non-critical-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (23 commits)
MAINTAINERS: fix git repositories for Broadcom SoCs
ARM: pxa: fix broken isa interrupts for zeus and viper
ARM: DRA7: hwmod: Fix boot crash with DEBUG_LL enabled on UART3
ARM: OMAP: DRA7: hwmod: Make gpmc software supervised as the smart idle is broken
ARM: AM43xx: hwmod: set DSS submodule parent hwmods
ARM: OMAP2+: hwmod: print error if wait_target_ready() failed
MAINTAINERS: add maintainer for OMAP hwmod data
ARM: OMAP2+: Disable omap3 PM init for ti81xx
ARM: OMAP2+: Fix reboot for 81xx
ARM: OMAP2+: Fix dm814 and dm816 for clocks and timer init
ARM: OMAP2+: Fix ti81xx class type
ARM: OMAP2+: Fix ti81xx devtype
ARM: OMAP2+: Fix error handling for omap2_clk_enable_init_clocks
MAINTAINERS: add a git entry for BMIPS-based BCM7xxx SoCs
MAINTAINERS: add a git entry for BCM7xxx ARM-based SoCs
MAINTAINERS: update Broadcom Cygnus SoC git tree
MAINTAINERS: move BCM63xx ARM-based SoCs git tree
hx4700: regulator: declare full constraints
ARM: pxa: add regulator_has_full_constraints to spitz board file
ARM: pxa: add regulator_has_full_constraints to poodle board file
...
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index e75c21840815..b27178c87444 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -2144,7 +2144,7 @@ F: arch/arm/boot/dts/bcm470* | |||
2144 | BROADCOM BCM63XX ARM ARCHITECTURE | 2144 | BROADCOM BCM63XX ARM ARCHITECTURE |
2145 | M: Florian Fainelli <f.fainelli@gmail.com> | 2145 | M: Florian Fainelli <f.fainelli@gmail.com> |
2146 | L: linux-arm-kernel@lists.infradead.org | 2146 | L: linux-arm-kernel@lists.infradead.org |
2147 | T: git git://git.github.com/brcm/linux.git | 2147 | T: git git://github.com/broadcom/arm-bcm63xx.git |
2148 | S: Maintained | 2148 | S: Maintained |
2149 | F: arch/arm/mach-bcm/bcm63xx.c | 2149 | F: arch/arm/mach-bcm/bcm63xx.c |
2150 | F: arch/arm/include/debug/bcm63xx.S | 2150 | F: arch/arm/include/debug/bcm63xx.S |
@@ -2161,6 +2161,7 @@ M: Brian Norris <computersforpeace@gmail.com> | |||
2161 | M: Gregory Fong <gregory.0xf0@gmail.com> | 2161 | M: Gregory Fong <gregory.0xf0@gmail.com> |
2162 | M: Florian Fainelli <f.fainelli@gmail.com> | 2162 | M: Florian Fainelli <f.fainelli@gmail.com> |
2163 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) | 2163 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) |
2164 | T: git git://github.com/broadcom/stblinux.git | ||
2164 | S: Maintained | 2165 | S: Maintained |
2165 | F: arch/arm/mach-bcm/*brcmstb* | 2166 | F: arch/arm/mach-bcm/*brcmstb* |
2166 | F: arch/arm/boot/dts/bcm7*.dts* | 2167 | F: arch/arm/boot/dts/bcm7*.dts* |
@@ -2170,6 +2171,7 @@ BROADCOM BMIPS MIPS ARCHITECTURE | |||
2170 | M: Kevin Cernekee <cernekee@gmail.com> | 2171 | M: Kevin Cernekee <cernekee@gmail.com> |
2171 | M: Florian Fainelli <f.fainelli@gmail.com> | 2172 | M: Florian Fainelli <f.fainelli@gmail.com> |
2172 | L: linux-mips@linux-mips.org | 2173 | L: linux-mips@linux-mips.org |
2174 | T: git git://github.com/broadcom/stblinux.git | ||
2173 | S: Maintained | 2175 | S: Maintained |
2174 | F: arch/mips/bmips/* | 2176 | F: arch/mips/bmips/* |
2175 | F: arch/mips/include/asm/mach-bmips/* | 2177 | F: arch/mips/include/asm/mach-bmips/* |
@@ -2212,7 +2214,7 @@ M: Ray Jui <rjui@broadcom.com> | |||
2212 | M: Scott Branden <sbranden@broadcom.com> | 2214 | M: Scott Branden <sbranden@broadcom.com> |
2213 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) | 2215 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) |
2214 | L: bcm-kernel-feedback-list@broadcom.com | 2216 | L: bcm-kernel-feedback-list@broadcom.com |
2215 | T: git git://git.github.com/brcm/linux.git | 2217 | T: git git://github.com/broadcom/cygnus-linux.git |
2216 | S: Maintained | 2218 | S: Maintained |
2217 | N: iproc | 2219 | N: iproc |
2218 | N: cygnus | 2220 | N: cygnus |
@@ -7044,6 +7046,12 @@ L: linux-omap@vger.kernel.org | |||
7044 | S: Maintained | 7046 | S: Maintained |
7045 | F: arch/arm/mach-omap2/omap_hwmod.* | 7047 | F: arch/arm/mach-omap2/omap_hwmod.* |
7046 | 7048 | ||
7049 | OMAP HWMOD DATA | ||
7050 | M: Paul Walmsley <paul@pwsan.com> | ||
7051 | L: linux-omap@vger.kernel.org | ||
7052 | S: Maintained | ||
7053 | F: arch/arm/mach-omap2/omap_hwmod*data* | ||
7054 | |||
7047 | OMAP HWMOD DATA FOR OMAP4-BASED DEVICES | 7055 | OMAP HWMOD DATA FOR OMAP4-BASED DEVICES |
7048 | M: Benoît Cousson <bcousson@baylibre.com> | 7056 | M: Benoît Cousson <bcousson@baylibre.com> |
7049 | L: linux-omap@vger.kernel.org | 7057 | L: linux-omap@vger.kernel.org |