Commit 810813c4 authored by David S. Miller's avatar David S. Miller
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 



Several cases of overlapping changes, as well as one instance
(vxlan) of a bug fix in 'net' overlapping with code movement
in 'net-next'.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents d66ab514 e2857b8f

Documentation/DocBook/media/v4l/media-types.xml

+0 −4
Original line number Diff line number Diff line
@@ -56,10 +56,6 @@ 
	    <entry><constant>MEDIA_ENT_F_CONN_COMPOSITE</constant></entry>

	    <entry>Connector for a RGB composite signal.</entry>

	  </row>

	  <row>

	    <entry><constant>MEDIA_ENT_F_CONN_TEST</constant></entry>

	    <entry>Connector for a test generator.</entry>

	  </row>

	  <row>

	    <entry><constant>MEDIA_ENT_F_CAM_SENSOR</constant></entry>

	    <entry>Camera video sensor entity.</entry>

Documentation/devicetree/bindings/regulator/tps65217.txt

+0 −10
Original line number Diff line number Diff line
@@ -26,11 +26,7 @@ Example: 
		ti,pmic-shutdown-controller;



		regulators {

			#address-cells = <1>;

			#size-cells = <0>;



			dcdc1_reg: dcdc1 {

				reg = <0>;

				regulator-min-microvolt = <900000>;

				regulator-max-microvolt = <1800000>;

				regulator-boot-on;
@@ -38,7 +34,6 @@ Example: 
			};



			dcdc2_reg: dcdc2 {

				reg = <1>;

				regulator-min-microvolt = <900000>;

				regulator-max-microvolt = <3300000>;

				regulator-boot-on;
@@ -46,7 +41,6 @@ Example: 
			};



			dcdc3_reg: dcc3 {

				reg = <2>;

				regulator-min-microvolt = <900000>;

				regulator-max-microvolt = <1500000>;

				regulator-boot-on;
@@ -54,7 +48,6 @@ Example: 
			};



			ldo1_reg: ldo1 {

				reg = <3>;

				regulator-min-microvolt = <1000000>;

				regulator-max-microvolt = <3300000>;

				regulator-boot-on;
@@ -62,7 +55,6 @@ Example: 
			};



			ldo2_reg: ldo2 {

				reg = <4>;

				regulator-min-microvolt = <900000>;

				regulator-max-microvolt = <3300000>;

				regulator-boot-on;
@@ -70,7 +62,6 @@ Example: 
			};



			ldo3_reg: ldo3 {

				reg = <5>;

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <3300000>;

				regulator-boot-on;
@@ -78,7 +69,6 @@ Example: 
			};



			ldo4_reg: ldo4 {

				reg = <6>;

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <3300000>;

				regulator-boot-on;

Documentation/watchdog/watchdog-parameters.txt

+4 −0
Original line number Diff line number Diff line
@@ -400,3 +400,7 @@ wm8350_wdt: 
nowayout: Watchdog cannot be stopped once started

	(default=kernel config parameter)

-------------------------------------------------

sun4v_wdt:

timeout_ms: Watchdog timeout in milliseconds 1..180000, default=60000)

nowayout: Watchdog cannot be stopped once started

-------------------------------------------------

MAINTAINERS

+37 −11
Original line number Diff line number Diff line
@@ -920,17 +920,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>
@@ -3446,7 +3453,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/
@@ -4522,6 +4528,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
@@ -4538,7 +4550,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
@@ -4552,6 +4564,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
@@ -6769,6 +6790,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>
@@ -7365,7 +7387,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
@@ -7696,13 +7718,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
@@ -7933,11 +7955,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 +9592,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>

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 5

SUBLEVEL = 0

EXTRAVERSION = -rc5

EXTRAVERSION = -rc7

NAME = Blurry Fish Butt



# *DOCUMENTATION*