diff options
author | Olof Johansson <olof@lixom.net> | 2015-04-20 10:59:04 -0400 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2015-04-20 10:59:04 -0400 |
commit | cdaa8cf34863028dab238e1498555bf12d693244 (patch) | |
tree | 0034305d152c3c4887b81c8983d0f298e6e3f6cb /MAINTAINERS | |
parent | 30a5c1894a4c932f5a417f0a6ec369c7da81204b (diff) | |
parent | 98b80987c940956da48f0c703f60340128bb8521 (diff) |
Merge branch 'fixes' into next/fixes-non-critical
Merge a set of fixes that we missed sending in before v4.0 release. These
will also be sent to -stable.
* fixes: (659 commits)
ARM: at91/dt: sama5d3 xplained: add phy address for macb1
kbuild: Create directory for target DTB
ARM: mvebu: Disable CPU Idle on Armada 38x
arm64: juno: Fix misleading name of UART reference clock
ARM: dts: sunxi: Remove overclocked/overvoltaged OPP
ARM: dts: sun4i: a10-lime: Override and remove 1008MHz OPP setting
ARM: socfpga: dts: fix spi1 interrupt
ARM: dts: Fix gpio interrupts for dm816x
ARM: dts: dra7: remove ti,hwmod property from pcie phy
ARM: EXYNOS: Fix build breakage cpuidle on !SMP
ARM: OMAP: dmtimer: disable pm runtime on remove
ARM: OMAP: dmtimer: check for pm_runtime_get_sync() failure
ARM: dts: fix lid and power pin-functions for exynos5250-spring
ARM: dts: fix mmc node updates for exynos5250-spring
ARM: OMAP2+: Fix socbus family info for AM33xx devices
ARM: dts: omap3: Add missing dmas for crypto
+ Linux 4.0-rc4
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 500501f72b17..7b0f26a3cec0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -1030,6 +1030,16 @@ F: arch/arm/mach-mxs/ | |||
1030 | F: arch/arm/boot/dts/imx* | 1030 | F: arch/arm/boot/dts/imx* |
1031 | F: arch/arm/configs/imx*_defconfig | 1031 | F: arch/arm/configs/imx*_defconfig |
1032 | 1032 | ||
1033 | ARM/FREESCALE VYBRID ARM ARCHITECTURE | ||
1034 | M: Shawn Guo <shawn.guo@linaro.org> | ||
1035 | M: Sascha Hauer <kernel@pengutronix.de> | ||
1036 | R: Stefan Agner <stefan@agner.ch> | ||
1037 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) | ||
1038 | S: Maintained | ||
1039 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git | ||
1040 | F: arch/arm/mach-imx/*vf610* | ||
1041 | F: arch/arm/boot/dts/vf* | ||
1042 | |||
1033 | ARM/GLOMATION GESBC9312SX MACHINE SUPPORT | 1043 | ARM/GLOMATION GESBC9312SX MACHINE SUPPORT |
1034 | M: Lennert Buytenhek <kernel@wantstofly.org> | 1044 | M: Lennert Buytenhek <kernel@wantstofly.org> |
1035 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) | 1045 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) |
@@ -1188,6 +1198,7 @@ ARM/Marvell Dove/MV78xx0/Orion SOC support | |||
1188 | M: Jason Cooper <jason@lakedaemon.net> | 1198 | M: Jason Cooper <jason@lakedaemon.net> |
1189 | M: Andrew Lunn <andrew@lunn.ch> | 1199 | M: Andrew Lunn <andrew@lunn.ch> |
1190 | M: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> | 1200 | M: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> |
1201 | M: Gregory Clement <gregory.clement@free-electrons.com> | ||
1191 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) | 1202 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) |
1192 | S: Maintained | 1203 | S: Maintained |
1193 | F: arch/arm/mach-dove/ | 1204 | F: arch/arm/mach-dove/ |
@@ -1351,6 +1362,7 @@ F: drivers/i2c/busses/i2c-rk3x.c | |||
1351 | F: drivers/*/*rockchip* | 1362 | F: drivers/*/*rockchip* |
1352 | F: drivers/*/*/*rockchip* | 1363 | F: drivers/*/*/*rockchip* |
1353 | F: sound/soc/rockchip/ | 1364 | F: sound/soc/rockchip/ |
1365 | N: rockchip | ||
1354 | 1366 | ||
1355 | ARM/SAMSUNG EXYNOS ARM ARCHITECTURES | 1367 | ARM/SAMSUNG EXYNOS ARM ARCHITECTURES |
1356 | M: Kukjin Kim <kgene@kernel.org> | 1368 | M: Kukjin Kim <kgene@kernel.org> |
@@ -2065,7 +2077,7 @@ F: include/net/bluetooth/ | |||
2065 | BONDING DRIVER | 2077 | BONDING DRIVER |
2066 | M: Jay Vosburgh <j.vosburgh@gmail.com> | 2078 | M: Jay Vosburgh <j.vosburgh@gmail.com> |
2067 | M: Veaceslav Falico <vfalico@gmail.com> | 2079 | M: Veaceslav Falico <vfalico@gmail.com> |
2068 | M: Andy Gospodarek <andy@greyhouse.net> | 2080 | M: Andy Gospodarek <gospo@cumulusnetworks.com> |
2069 | L: netdev@vger.kernel.org | 2081 | L: netdev@vger.kernel.org |
2070 | W: http://sourceforge.net/projects/bonding/ | 2082 | W: http://sourceforge.net/projects/bonding/ |
2071 | S: Supported | 2083 | S: Supported |
@@ -2107,7 +2119,6 @@ F: drivers/net/ethernet/broadcom/bnx2x/ | |||
2107 | 2119 | ||
2108 | BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITECTURE | 2120 | BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITECTURE |
2109 | M: Christian Daudt <bcm@fixthebug.org> | 2121 | M: Christian Daudt <bcm@fixthebug.org> |
2110 | M: Matt Porter <mporter@linaro.org> | ||
2111 | M: Florian Fainelli <f.fainelli@gmail.com> | 2122 | M: Florian Fainelli <f.fainelli@gmail.com> |
2112 | L: bcm-kernel-feedback-list@broadcom.com | 2123 | L: bcm-kernel-feedback-list@broadcom.com |
2113 | T: git git://github.com/broadcom/mach-bcm | 2124 | T: git git://github.com/broadcom/mach-bcm |
@@ -2369,8 +2380,9 @@ F: arch/x86/include/asm/tce.h | |||
2369 | 2380 | ||
2370 | CAN NETWORK LAYER | 2381 | CAN NETWORK LAYER |
2371 | M: Oliver Hartkopp <socketcan@hartkopp.net> | 2382 | M: Oliver Hartkopp <socketcan@hartkopp.net> |
2383 | M: Marc Kleine-Budde <mkl@pengutronix.de> | ||
2372 | L: linux-can@vger.kernel.org | 2384 | L: linux-can@vger.kernel.org |
2373 | W: http://gitorious.org/linux-can | 2385 | W: https://github.com/linux-can |
2374 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can.git | 2386 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can.git |
2375 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next.git | 2387 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next.git |
2376 | S: Maintained | 2388 | S: Maintained |
@@ -2386,7 +2398,7 @@ CAN NETWORK DRIVERS | |||
2386 | M: Wolfgang Grandegger <wg@grandegger.com> | 2398 | M: Wolfgang Grandegger <wg@grandegger.com> |
2387 | M: Marc Kleine-Budde <mkl@pengutronix.de> | 2399 | M: Marc Kleine-Budde <mkl@pengutronix.de> |
2388 | L: linux-can@vger.kernel.org | 2400 | L: linux-can@vger.kernel.org |
2389 | W: http://gitorious.org/linux-can | 2401 | W: https://github.com/linux-can |
2390 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can.git | 2402 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can.git |
2391 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next.git | 2403 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next.git |
2392 | S: Maintained | 2404 | S: Maintained |
@@ -8482,6 +8494,14 @@ S: Supported | |||
8482 | L: netdev@vger.kernel.org | 8494 | L: netdev@vger.kernel.org |
8483 | F: drivers/net/ethernet/samsung/sxgbe/ | 8495 | F: drivers/net/ethernet/samsung/sxgbe/ |
8484 | 8496 | ||
8497 | SAMSUNG THERMAL DRIVER | ||
8498 | M: Lukasz Majewski <l.majewski@samsung.com> | ||
8499 | L: linux-pm@vger.kernel.org | ||
8500 | L: linux-samsung-soc@vger.kernel.org | ||
8501 | S: Supported | ||
8502 | T: https://github.com/lmajewski/linux-samsung-thermal.git | ||
8503 | F: drivers/thermal/samsung/ | ||
8504 | |||
8485 | SAMSUNG USB2 PHY DRIVER | 8505 | SAMSUNG USB2 PHY DRIVER |
8486 | M: Kamil Debski <k.debski@samsung.com> | 8506 | M: Kamil Debski <k.debski@samsung.com> |
8487 | L: linux-kernel@vger.kernel.org | 8507 | L: linux-kernel@vger.kernel.org |