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

Commit 4ceedcf8 authored Sep 29, 2013 by Greg Kroah-Hartman

Merge 3.12-rc3 into tty-next



We want the tty/serial fixes in here as well.

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

parents 05855573 15c03dd4

CREDITS

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -2808,8 +2808,7 @@ S: Ottawa, Ontario
	S: Canada K2P 0X8		S: Canada K2P 0X8

	N: Mikael Pettersson		N: Mikael Pettersson
	E: mikpe@it.uu.se		E: mikpelinux@gmail.com
	W: http://user.it.uu.se/~mikpe/linux/
	D: Miscellaneous fixes		D: Miscellaneous fixes

	N: Reed H. Petty		N: Reed H. Petty

Documentation/devicetree/bindings/mmc/exynos-dw-mshc.txt

+5 −5

Original line number	Original line	Diff line number	Diff line
	* Samsung Exynos specific extensions to the Synopsis Designware Mobile		* Samsung Exynos specific extensions to the Synopsys Designware Mobile
	Storage Host Controller		Storage Host Controller

	The Synopsis designware mobile storage host controller is used to interface		The Synopsys designware mobile storage host controller is used to interface
	a SoC with storage medium such as eMMC or SD/MMC cards. This file documents		a SoC with storage medium such as eMMC or SD/MMC cards. This file documents
	differences between the core Synopsis dw mshc controller properties described		differences between the core Synopsys dw mshc controller properties described
	by synopsis-dw-mshc.txt and the properties used by the Samsung Exynos specific		by synopsys-dw-mshc.txt and the properties used by the Samsung Exynos specific
	extensions to the Synopsis Designware Mobile Storage Host Controller.		extensions to the Synopsys Designware Mobile Storage Host Controller.

	Required Properties:		Required Properties:

Documentation/devicetree/bindings/mmc/rockchip-dw-mshc.txt

+5 −5

Original line number	Original line	Diff line number	Diff line
	* Rockchip specific extensions to the Synopsis Designware Mobile		* Rockchip specific extensions to the Synopsys Designware Mobile
	Storage Host Controller		Storage Host Controller

	The Synopsis designware mobile storage host controller is used to interface		The Synopsys designware mobile storage host controller is used to interface
	a SoC with storage medium such as eMMC or SD/MMC cards. This file documents		a SoC with storage medium such as eMMC or SD/MMC cards. This file documents
	differences between the core Synopsis dw mshc controller properties described		differences between the core Synopsys dw mshc controller properties described
	by synopsis-dw-mshc.txt and the properties used by the Rockchip specific		by synopsys-dw-mshc.txt and the properties used by the Rockchip specific
	extensions to the Synopsis Designware Mobile Storage Host Controller.		extensions to the Synopsys Designware Mobile Storage Host Controller.

	Required Properties:		Required Properties:

Documentation/devicetree/bindings/mmc/synopsis-dw-mshc.txt→Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt

+4 −4

Original line number	Original line	Diff line number	Diff line
	* Synopsis Designware Mobile Storage Host Controller		* Synopsys Designware Mobile Storage Host Controller

	The Synopsis designware mobile storage host controller is used to interface		The Synopsys designware mobile storage host controller is used to interface
	a SoC with storage medium such as eMMC or SD/MMC cards. This file documents		a SoC with storage medium such as eMMC or SD/MMC cards. This file documents
	differences between the core mmc properties described by mmc.txt and the		differences between the core mmc properties described by mmc.txt and the
	properties used by the Synopsis Designware Mobile Storage Host Controller.		properties used by the Synopsys Designware Mobile Storage Host Controller.

	Required Properties:		Required Properties:

	* compatible: should be		* compatible: should be
	- snps,dw-mshc: for controllers compliant with synopsis dw-mshc.		- snps,dw-mshc: for controllers compliant with synopsys dw-mshc.
	* #address-cells: should be 1.		* #address-cells: should be 1.
	* #size-cells: should be 0.		* #size-cells: should be 0.

Documentation/devicetree/bindings/pci/designware-pcie.txt

+1 −1

Original line number	Original line	Diff line number	Diff line
	* Synopsis Designware PCIe interface		* Synopsys Designware PCIe interface

	Required properties:		Required properties:
	- compatible: should contain "snps,dw-pcie" to identify the		- compatible: should contain "snps,dw-pcie" to identify the