Merge drm-fixes into drm-next.

Nouveau wanted this to avoid some worse conflicts when I merge that.

1 files changed, 45 insertions, 27 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index ea1d1deaf153..10562167b85e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -926,17 +926,24 @@ M:	Emilio López <emilio@elopez.com.ar>
 S:      Maintained
 F:      drivers/clk/sunxi/
 
-ARM/Amlogic MesonX SoC support
+ARM/Amlogic Meson SoC support
 M:      Carlo Caione <carlo@caione.org>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+L:      linux-meson@googlegroups.com
+W:      http://linux-meson.com/
 S:      Maintained
-F:      drivers/media/rc/meson-ir.c
-N:      meson[x68]
+F:      arch/arm/mach-meson/
+F:      arch/arm/boot/dts/meson*
+N:      meson
 
 ARM/Annapurna Labs ALPINE ARCHITECTURE
 M:      Tsahee Zidenberg <tsahee@annapurnalabs.com>
+M:      Antoine Tenart <antoine.tenart@free-electrons.com>
 S:      Maintained
 F:      arch/arm/mach-alpine/
+F:      arch/arm/boot/dts/alpine*
+F:      arch/arm64/boot/dts/al/
+F:      drivers/*/*alpine*
 
 ARM/ATMEL AT91RM9200, AT91SAM9 AND SAMA5 SOC SUPPORT
 M:      Nicolas Ferre <nicolas.ferre@atmel.com>
@@ -1448,8 +1455,8 @@ S:	Maintained
 ARM/RENESAS ARM64 ARCHITECTURE
 M:      Simon Horman <horms@verge.net.au>
 M:      Magnus Damm <magnus.damm@gmail.com>
-L:      linux-sh@vger.kernel.org
-Q:      http://patchwork.kernel.org/project/linux-sh/list/
+L:      linux-renesas-soc@vger.kernel.org
+Q:      http://patchwork.kernel.org/project/linux-renesas-soc/list/
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git next
 S:      Supported
 F:      arch/arm64/boot/dts/renesas/
@@ -2368,14 +2375,6 @@ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/rpi/linux-rpi.git
 S:      Maintained
 N:      bcm2835
 
-BROADCOM BCM33XX MIPS ARCHITECTURE
-M:      Kevin Cernekee <cernekee@gmail.com>
-L:      linux-mips@linux-mips.org
-S:      Maintained
-F:      arch/mips/bcm3384/*
-F:      arch/mips/include/asm/mach-bcm3384/*
-F:      arch/mips/kernel/*bmips*
-
 BROADCOM BCM47XX MIPS ARCHITECTURE
 M:      Hauke Mehrtens <hauke@hauke-m.de>
 M:      Rafał Miłecki <zajec5@gmail.com>
@@ -3458,7 +3457,6 @@ F:	drivers/usb/dwc2/
 DESIGNWARE USB3 DRD IP DRIVER
 M:      Felipe Balbi <balbi@kernel.org>
 L:      linux-usb@vger.kernel.org
-L:      linux-omap@vger.kernel.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git
 S:      Maintained
 F:      drivers/usb/dwc3/
@@ -4526,6 +4524,12 @@ L:	linuxppc-dev@lists.ozlabs.org
 S:      Maintained
 F:      drivers/dma/fsldma.*
 
+FREESCALE GPMI NAND DRIVER
+M:      Han Xu <han.xu@nxp.com>
+L:      linux-mtd@lists.infradead.org
+S:      Maintained
+F:      drivers/mtd/nand/gpmi-nand/*
+
 FREESCALE I2C CPM DRIVER
 M:      Jochen Friedrich <jochen@scram.de>
 L:      linuxppc-dev@lists.ozlabs.org
@@ -4542,7 +4546,7 @@ F:	include/linux/platform_data/video-imxfb.h
 F:      drivers/video/fbdev/imxfb.c
 
 FREESCALE QUAD SPI DRIVER
-M:      Han Xu <han.xu@freescale.com>
+M:      Han Xu <han.xu@nxp.com>
 L:      linux-mtd@lists.infradead.org
 S:      Maintained
 F:      drivers/mtd/spi-nor/fsl-quadspi.c
@@ -4556,6 +4560,15 @@ S:	Maintained
 F:      drivers/net/ethernet/freescale/fs_enet/
 F:      include/linux/fs_enet_pd.h
 
+FREESCALE IMX / MXC FEC DRIVER
+M:      Fugang Duan <fugang.duan@nxp.com>
+L:      netdev@vger.kernel.org
+S:      Maintained
+F:      drivers/net/ethernet/freescale/fec_main.c
+F:      drivers/net/ethernet/freescale/fec_ptp.c
+F:      drivers/net/ethernet/freescale/fec.h
+F:      Documentation/devicetree/bindings/net/fsl-fec.txt
+
 FREESCALE QUICC ENGINE LIBRARY
 L:      linuxppc-dev@lists.ozlabs.org
 S:      Orphan
@@ -6142,7 +6155,7 @@ F:	include/uapi/linux/sunrpc/
 
 KERNEL SELFTEST FRAMEWORK
 M:      Shuah Khan <shuahkh@osg.samsung.com>
-L:      linux-api@vger.kernel.org
+L:      linux-kselftest@vger.kernel.org
 T:      git git://git.kernel.org/pub/scm/shuah/linux-kselftest
 S:      Maintained
 F:      tools/testing/selftests
@@ -6772,6 +6785,7 @@ S:	Maintained
 F:      Documentation/networking/mac80211-injection.txt
 F:      include/net/mac80211.h
 F:      net/mac80211/
+F:      drivers/net/wireless/mac80211_hwsim.[ch]
 
 MACVLAN DRIVER
 M:      Patrick McHardy <kaber@trash.net>
@@ -7368,7 +7382,7 @@ F:	drivers/tty/isicom.c
 F:      include/linux/isicom.h
 
 MUSB MULTIPOINT HIGH SPEED DUAL-ROLE CONTROLLER
-M:      Felipe Balbi <balbi@kernel.org>
+M:      Bin Liu <b-liu@ti.com>
 L:      linux-usb@vger.kernel.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git
 S:      Maintained
@@ -7700,13 +7714,13 @@ S:	Maintained
 F:      arch/nios2/
 
 NOKIA N900 POWER SUPPLY DRIVERS
-M:      Pali Rohár <pali.rohar@gmail.com>
-S:      Maintained
+R:      Pali Rohár <pali.rohar@gmail.com>
 F:      include/linux/power/bq2415x_charger.h
 F:      include/linux/power/bq27xxx_battery.h
 F:      include/linux/power/isp1704_charger.h
 F:      drivers/power/bq2415x_charger.c
 F:      drivers/power/bq27xxx_battery.c
+F:      drivers/power/bq27xxx_battery_i2c.c
 F:      drivers/power/isp1704_charger.c
 F:      drivers/power/rx51_battery.c
 
@@ -7937,11 +7951,9 @@ F:	drivers/media/platform/omap3isp/
 F:      drivers/staging/media/omap4iss/
 
 OMAP USB SUPPORT
-M:      Felipe Balbi <balbi@kernel.org>
 L:      linux-usb@vger.kernel.org
 L:      linux-omap@vger.kernel.org
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git
-S:      Maintained
+S:      Orphan
 F:      drivers/usb/*/*omap*
 F:      arch/arm/*omap*/usb*
 
@@ -9572,6 +9584,12 @@ M:	Andreas Noever <andreas.noever@gmail.com>
 S:      Maintained
 F:      drivers/thunderbolt/
 
+TI BQ27XXX POWER SUPPLY DRIVER
+R:      Andrew F. Davis <afd@ti.com>
+F:      include/linux/power/bq27xxx_battery.h
+F:      drivers/power/bq27xxx_battery.c
+F:      drivers/power/bq27xxx_battery_i2c.c
+
 TIMEKEEPING, CLOCKSOURCE CORE, NTP, ALARMTIMER
 M:      John Stultz <john.stultz@linaro.org>
 M:      Thomas Gleixner <tglx@linutronix.de>
@@ -9793,10 +9811,11 @@ S:	Supported
 F:      drivers/scsi/be2iscsi/
 
 Emulex 10Gbps NIC BE2, BE3-R, Lancer, Skyhawk-R DRIVER
-M:      Sathya Perla <sathya.perla@avagotech.com>
-M:      Ajit Khaparde <ajit.khaparde@avagotech.com>
-M:      Padmanabh Ratnakar <padmanabh.ratnakar@avagotech.com>
-M:      Sriharsha Basavapatna <sriharsha.basavapatna@avagotech.com>
+M:      Sathya Perla <sathya.perla@broadcom.com>
+M:      Ajit Khaparde <ajit.khaparde@broadcom.com>
+M:      Padmanabh Ratnakar <padmanabh.ratnakar@broadcom.com>
+M:      Sriharsha Basavapatna <sriharsha.basavapatna@broadcom.com>
+M:      Somnath Kotur <somnath.kotur@broadcom.com>
 L:      netdev@vger.kernel.org
 W:      http://www.emulex.com
 S:      Supported
@@ -12034,7 +12053,6 @@ F:	arch/arm64/xen/
 F:      arch/arm64/include/asm/xen/
 
 XEN NETWORK BACKEND DRIVER
-M:      Ian Campbell <ian.campbell@citrix.com>
 M:      Wei Liu <wei.liu2@citrix.com>
 L:      xen-devel@lists.xenproject.org (moderated for non-subscribers)
 L:      netdev@vger.kernel.org