Commit 4a8f5058 authored Aug 02, 2011 by Len Brown

Merge branches 'acpica', 'battery', 'boot-irqs', 'bz-24492', 'bz-9528',...


Merge branches 'acpica', 'battery', 'boot-irqs', 'bz-24492', 'bz-9528', 'from-akpm', 'kexec-param' and 'misc' into release

Conflicts:
	Documentation/kernel-parameters.txt

Signed-off-by: Len Brown <len.brown@intel.com>

parents 3eb208f0 eb03cb02 d7f6169a e4108292 bb0c5ed6 aa165971 4996c023 6c8111e9

Documentation/feature-removal-schedule.txt

+0 −9

Original line number	Original line	Diff line number	Diff line
	@@ -310,15 +310,6 @@ Who: Ravikiran Thirumalai <kiran@scalex86.org>

	---------------------------		---------------------------

	What: CONFIG_THERMAL_HWMON
	When: January 2009
	Why: This option was introduced just to allow older lm-sensors userspace
	to keep working over the upgrade to 2.6.26. At the scheduled time of
	removal fixed lm-sensors (2.x or 3.x) should be readily available.
	Who: Rene Herman <rene.herman@gmail.com>

	---------------------------

	What: Code that is now under CONFIG_WIRELESS_EXT_SYSFS		What: Code that is now under CONFIG_WIRELESS_EXT_SYSFS
	(in net/core/net-sysfs.c)		(in net/core/net-sysfs.c)
	When: After the only user (hal) has seen a release with the patches		When: After the only user (hal) has seen a release with the patches

Documentation/filesystems/nilfs2.txt

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -40,7 +40,6 @@ Features which NILFS2 does not support yet:
	- POSIX ACLs		- POSIX ACLs
	- quotas		- quotas
	- fsck		- fsck
	- resize
	- defragmentation		- defragmentation

	Mount options		Mount options

Documentation/kernel-parameters.txt

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -163,6 +163,11 @@ bytes respectively. Such letter suffixes can also be entirely omitted.

	See also Documentation/power/pm.txt, pci=noacpi		See also Documentation/power/pm.txt, pci=noacpi

			acpi_rsdp= [ACPI,EFI,KEXEC]
			Pass the RSDP address to the kernel, mostly used
			on machines running EFI runtime service to boot the
			second kernel for kdump.

	acpi_apic_instance= [ACPI, IOAPIC]		acpi_apic_instance= [ACPI, IOAPIC]
	Format: <int>		Format: <int>
	2: use 2nd APIC table, if available		2: use 2nd APIC table, if available

Documentation/networking/ip-sysctl.txt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -346,7 +346,7 @@ tcp_orphan_retries - INTEGER
	when RTO retransmissions remain unacknowledged.		when RTO retransmissions remain unacknowledged.
	See tcp_retries2 for more details.		See tcp_retries2 for more details.

	The default value is 7.		The default value is 8.
	If your machine is a loaded WEB server,		If your machine is a loaded WEB server,
	you should think about lowering this value, such sockets		you should think about lowering this value, such sockets
	may consume significant resources. Cf. tcp_max_orphans.		may consume significant resources. Cf. tcp_max_orphans.

Documentation/x86/boot.txt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -674,7 +674,7 @@ Protocol: 2.10+

	Field name: init_size		Field name: init_size
	Type: read		Type: read
	Offset/size: 0x25c/4		Offset/size: 0x260/4

	This field indicates the amount of linear contiguous memory starting		This field indicates the amount of linear contiguous memory starting
	at the kernel runtime start address that the kernel needs before it		at the kernel runtime start address that the kernel needs before it