Commit 6394d6d0 authored Jun 08, 2015 by Greg Kroah-Hartman

Merge 4.1-rc7 into staging-testing



We want the staging tree fixes in here too to help with testing and
merge issues.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parents 08486112 d4a4f75c

Documentation/ABI/testing/sysfs-devices-system-cpu

+1 −1

Original line number	Diff line number	Diff line
		@@ -162,7 +162,7 @@ Description: Discover CPUs in the same CPU frequency coordination domain
		What: /sys/devices/system/cpu/cpu*/cache/index3/cache_disable_{0,1}
		Date: August 2008
		KernelVersion: 2.6.27
		Contact: discuss@x86-64.org
		Contact: Linux kernel mailing list <linux-kernel@vger.kernel.org>
		Description: Disable L3 cache indices

		These files exist in every CPU's cache/index3 directory. Each

Documentation/devicetree/bindings/clock/silabs,si5351.txt

+3 −1

Original line number	Diff line number	Diff line
		@@ -17,7 +17,8 @@ Required properties:
		- #clock-cells: from common clock binding; shall be set to 1.
		- clocks: from common clock binding; list of parent clock
		handles, shall be xtal reference clock or xtal and clkin for
		si5351c only.
		si5351c only. Corresponding clock input names are "xtal" and
		"clkin" respectively.
		- #address-cells: shall be set to 1.
		- #size-cells: shall be set to 0.

		@@ -71,6 +72,7 @@ i2c-master-node {

		/* connect xtal input to 25MHz reference */
		clocks = <&ref25>;
		clock-names = "xtal";

		/* connect xtal input as source of pll0 and pll1 */
		silabs,pll-source = <0 0>, <1 0>;

Documentation/devicetree/bindings/net/cdns-emac.txt

+2 −1

Original line number	Diff line number	Diff line
		@@ -3,7 +3,8 @@
		Required properties:
		- compatible: Should be "cdns,[<chip>-]{emac}"
		Use "cdns,at91rm9200-emac" Atmel at91rm9200 SoC.
		or the generic form: "cdns,emac".
		Use "cdns,zynq-gem" Xilinx Zynq-7xxx SoC.
		Or the generic form: "cdns,emac".
		- reg: Address and length of the register set for the device
		- interrupts: Should contain macb interrupt
		- phy-mode: see ethernet.txt file in the same directory.

Documentation/devicetree/bindings/usb/renesas_usbhs.txt

+2 −4

Original line number	Diff line number	Diff line
		@@ -15,10 +15,8 @@ Optional properties:
		- phys: phandle + phy specifier pair
		- phy-names: must be "usb"
		- dmas: Must contain a list of references to DMA specifiers.
		- dma-names : Must contain a list of DMA names:
		- tx0 ... tx<n>
		- rx0 ... rx<n>
		- This <n> means DnFIFO in USBHS module.
		- dma-names : named "ch%d", where %d is the channel number ranging from zero
		to the number of channels (DnFIFOs) minus one.

		Example:
		usbhs: usb@e6590000 {

Documentation/hwmon/tmp401

+1 −1

Original line number	Diff line number	Diff line
		@@ -20,7 +20,7 @@ Supported chips:
		Datasheet: http://focus.ti.com/docs/prod/folders/print/tmp432.html
		* Texas Instruments TMP435
		Prefix: 'tmp435'
		Addresses scanned: I2C 0x37, 0x48 - 0x4f
		Addresses scanned: I2C 0x48 - 0x4f
		Datasheet: http://focus.ti.com/docs/prod/folders/print/tmp435.html

		Authors: