Merge branch 'board' of... (81f96172) · Commits · jan.koester / Linux

Documentation/devicetree/bindings/ata/calxeda-sata.txt→Documentation/devicetree/bindings/ata/ahci-platform.txt

+2 −3

Original line number	Original line	Diff line number	Diff line
	* Calxeda SATA Controller		* AHCI SATA Controller

	SATA nodes are defined to describe on-chip Serial ATA controllers.		SATA nodes are defined to describe on-chip Serial ATA controllers.
	Each SATA controller should have its own node.		Each SATA controller should have its own node.

	Required properties:		Required properties:
	- compatible : compatible list, contains "calxeda,hb-ahci"		- compatible : compatible list, contains "calxeda,hb-ahci" or "snps,spear-ahci"
	- interrupts : <interrupt mapping for SATA IRQ>		- interrupts : <interrupt mapping for SATA IRQ>
	- reg : <registers mapping>		- reg : <registers mapping>

	@@ -14,4 +14,3 @@ Example:
	reg = <0xffe08000 0x1000>;		reg = <0xffe08000 0x1000>;
	interrupts = <115>;		interrupts = <115>;
	};		};

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -3,6 +3,8 @@
	Required properties:		Required properties:
	- compatible : "fsl,sgtl5000".		- compatible : "fsl,sgtl5000".

			- reg : the I2C address of the device

	Example:		Example:

	codec: sgtl5000@0a {		codec: sgtl5000@0a {

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -147,7 +147,7 @@ tcp_adv_win_scale - INTEGER
	(if tcp_adv_win_scale > 0) or bytes-bytes/2^(-tcp_adv_win_scale),		(if tcp_adv_win_scale > 0) or bytes-bytes/2^(-tcp_adv_win_scale),
	if it is <= 0.		if it is <= 0.
	Possible values are [-31, 31], inclusive.		Possible values are [-31, 31], inclusive.
	Default: 2		Default: 1

	tcp_allowed_congestion_control - STRING		tcp_allowed_congestion_control - STRING
	Show/set the congestion control choices available to non-privileged		Show/set the congestion control choices available to non-privileged
	@@ -410,7 +410,7 @@ tcp_rmem - vector of 3 INTEGERs: min, default, max
	net.core.rmem_max. Calling setsockopt() with SO_RCVBUF disables		net.core.rmem_max. Calling setsockopt() with SO_RCVBUF disables
	automatic tuning of that socket's receive buffer size, in which		automatic tuning of that socket's receive buffer size, in which
	case this value is ignored.		case this value is ignored.
	Default: between 87380B and 4MB, depending on RAM size.		Default: between 87380B and 6MB, depending on RAM size.

	tcp_sack - BOOLEAN		tcp_sack - BOOLEAN
	Enable select acknowledgments (SACKS).		Enable select acknowledgments (SACKS).

+2 −5

Original line number	Original line	Diff line number	Diff line
	@@ -1968,10 +1968,7 @@ S: Maintained
	F: drivers/net/ethernet/ti/cpmac.c		F: drivers/net/ethernet/ti/cpmac.c

	CPU FREQUENCY DRIVERS		CPU FREQUENCY DRIVERS
	M: Dave Jones <davej@redhat.com>
	L: cpufreq@vger.kernel.org		L: cpufreq@vger.kernel.org
	W: http://www.codemonkey.org.uk/projects/cpufreq/
	T: git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git
	S: Maintained		S: Maintained
	F: drivers/cpufreq/		F: drivers/cpufreq/
	F: include/linux/cpufreq.h		F: include/linux/cpufreq.h
	@@ -5892,11 +5889,11 @@ F: Documentation/scsi/st.txt
	F: drivers/scsi/st*		F: drivers/scsi/st*

	SCTP PROTOCOL		SCTP PROTOCOL
	M: Vlad Yasevich <vladislav.yasevich@hp.com>		M: Vlad Yasevich <vyasevich@gmail.com>
	M: Sridhar Samudrala <sri@us.ibm.com>		M: Sridhar Samudrala <sri@us.ibm.com>
	L: linux-sctp@vger.kernel.org		L: linux-sctp@vger.kernel.org
	W: http://lksctp.sourceforge.net		W: http://lksctp.sourceforge.net
	S: Supported		S: Maintained
	F: Documentation/networking/sctp.txt		F: Documentation/networking/sctp.txt
	F: include/linux/sctp.h		F: include/linux/sctp.h
	F: include/net/sctp/		F: include/net/sctp/

+1 −1