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

Commit 6ca01a1b authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 3.17-rc6 into usb-next 



We want the USB fixes in this branch as well.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents 93177d1f 0f33be00

Documentation/devicetree/bindings/input/atmel,maxtouch.txt

+0 −4
Original line number Diff line number Diff line
@@ -11,10 +11,6 @@ Required properties: 


Optional properties for main touchpad device:



- linux,gpio-keymap: An array of up to 4 entries indicating the Linux

    keycode generated by each GPIO. Linux keycodes are defined in

    <dt-bindings/input/input.h>.



- linux,gpio-keymap: When enabled, the SPT_GPIOPWN_T19 object sends messages

    on GPIO bit changes. An array of up to 8 entries can be provided

    indicating the Linux keycode mapped to each bit of the status byte,

Documentation/devicetree/bindings/sound/rockchip-i2s.txt

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ i2s@ff890000 { 
	#address-cells = <1>;

	#size-cells = <0>;

	dmas = <&pdma1 0>, <&pdma1 1>;

	dma-names = "rx", "tx";

	dma-names = "tx", "rx";

	clock-names = "i2s_hclk", "i2s_clk";

	clocks = <&cru HCLK_I2S0>, <&cru SCLK_I2S0>;

};

Documentation/devicetree/bindings/spi/spi-rockchip.txt

+6 −2
Original line number Diff line number Diff line
@@ -16,11 +16,15 @@ Required Properties: 
- clocks: Must contain an entry for each entry in clock-names.

- clock-names: Shall be "spiclk" for the transfer-clock, and "apb_pclk" for

			   the peripheral clock.

- #address-cells: should be 1.

- #size-cells: should be 0.



Optional Properties:



- dmas: DMA specifiers for tx and rx dma. See the DMA client binding,

		Documentation/devicetree/bindings/dma/dma.txt

- dma-names: DMA request names should include "tx" and "rx" if present.

- #address-cells: should be 1.

- #size-cells: should be 0.





Example:

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -6878,7 +6878,7 @@ F: arch/x86/kernel/quirks.c 


PCI DRIVER FOR IMX6

M:	Richard Zhu <r65037@freescale.com>

M:	Shawn Guo <shawn.guo@freescale.com>

M:	Lucas Stach <l.stach@pengutronix.de>

L:	linux-pci@vger.kernel.org

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

Makefile

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

PATCHLEVEL = 17

SUBLEVEL = 0

EXTRAVERSION = -rc5

EXTRAVERSION = -rc6

NAME = Shuffling Zombie Juror



# *DOCUMENTATION*