Merge branch 'wells/lpc32xx-arch_v2' of git://git.lpclinux.com/linux-2.6-lpc into devel-stable (129961ec) · Commits · e / devices / android_kernel_fairphone_FP4

Documentation/00-INDEX

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -32,8 +32,6 @@ DocBook/
	- directory with DocBook templates etc. for kernel documentation.		- directory with DocBook templates etc. for kernel documentation.
	HOWTO		HOWTO
	- the process and procedures of how to do Linux kernel development.		- the process and procedures of how to do Linux kernel development.
	IO-mapping.txt
	- how to access I/O mapped memory from within device drivers.
	IPMI.txt		IPMI.txt
	- info on Linux Intelligent Platform Management Interface (IPMI) Driver.		- info on Linux Intelligent Platform Management Interface (IPMI) Driver.
	IRQ-affinity.txt		IRQ-affinity.txt
	@@ -84,6 +82,8 @@ blockdev/
	- info on block devices & drivers		- info on block devices & drivers
	btmrvl.txt		btmrvl.txt
	- info on Marvell Bluetooth driver usage.		- info on Marvell Bluetooth driver usage.
			bus-virt-phys-mapping.txt
			- how to access I/O mapped memory from within device drivers.
	cachetlb.txt		cachetlb.txt
	- describes the cache/TLB flushing interfaces Linux uses.		- describes the cache/TLB flushing interfaces Linux uses.
	cdrom/		cdrom/
	@@ -168,6 +168,8 @@ initrd.txt
	- how to use the RAM disk as an initial/temporary root filesystem.		- how to use the RAM disk as an initial/temporary root filesystem.
	input/		input/
	- info on Linux input device support.		- info on Linux input device support.
			io-mapping.txt
			- description of io_mapping functions in linux/io-mapping.h
	io_ordering.txt		io_ordering.txt
	- info on ordering I/O writes to memory-mapped addresses.		- info on ordering I/O writes to memory-mapped addresses.
	ioctl/		ioctl/

Documentation/IO-mapping.txt→Documentation/bus-virt-phys-mapping.txt

+0 −0

File moved.

View file

Documentation/feature-removal-schedule.txt

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -647,3 +647,10 @@ Who: Stefan Richter <stefanr@s5r6.in-berlin.de>

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

			What: The acpi_sleep=s4_nonvs command line option
			When: 2.6.37
			Files: arch/x86/kernel/acpi/sleep.c
			Why: superseded by acpi_sleep=nonvs
			Who: Rafael J. Wysocki <rjw@sisk.pl>

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

Documentation/kernel-parameters.txt

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -254,8 +254,8 @@ and is between 256 and 4096 characters. It is defined in the file
	control method, with respect to putting devices into		control method, with respect to putting devices into
	low power states, to be enforced (the ACPI 2.0 ordering		low power states, to be enforced (the ACPI 2.0 ordering
	of _PTS is used by default).		of _PTS is used by default).
	s4_nonvs prevents the kernel from saving/restoring the		nonvs prevents the kernel from saving/restoring the
	ACPI NVS memory during hibernation.		ACPI NVS memory during suspend/hibernation and resume.
	sci_force_enable causes the kernel to set SCI_EN directly		sci_force_enable causes the kernel to set SCI_EN directly
	on resume from S1/S3 (which is against the ACPI spec,		on resume from S1/S3 (which is against the ACPI spec,
	but some broken systems don't work without it).		but some broken systems don't work without it).

MAINTAINERS

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -5336,6 +5336,7 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git
	T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6.git		T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6.git
	S: Maintained		S: Maintained
	F: arch/sparc/		F: arch/sparc/
			F: drivers/sbus

	SPARC SERIAL DRIVERS		SPARC SERIAL DRIVERS
	M: "David S. Miller" <davem@davemloft.net>		M: "David S. Miller" <davem@davemloft.net>