Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6cbe9e4a authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into locking/core, to pick up fixes 



Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 29b75eb2 8e0f93cd

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/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

+17 −1
Original line number Diff line number Diff line
@@ -4518,6 +4518,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
@@ -4534,7 +4540,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
@@ -4548,6 +4554,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
@@ -6764,6 +6779,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>

Makefile

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

PATCHLEVEL = 5

SUBLEVEL = 0

EXTRAVERSION = -rc6

EXTRAVERSION = -rc7

NAME = Blurry Fish Butt



# *DOCUMENTATION*

arch/arm/boot/compressed/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -195,5 +195,7 @@ CFLAGS_font.o := -Dstatic= 
$(obj)/font.c: $(FONTC)

	$(call cmd,shipped)



AFLAGS_hyp-stub.o := -Wa,-march=armv7-a



$(obj)/hyp-stub.S: $(srctree)/arch/$(SRCARCH)/kernel/hyp-stub.S

	$(call cmd,shipped)