Merge /spare/repo/linux-2.6/ (1410b0a7) · Commits · e / devices / android_kernel_fairphone_FP4

CREDITS

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -2423,8 +2423,7 @@ S: Toronto, Ontario
	S: Canada		S: Canada

	N: Zwane Mwaikambo		N: Zwane Mwaikambo
	E: zwane@linuxpower.ca		E: zwane@arm.linux.org.uk
	W: http://function.linuxpower.ca
	D: Various driver hacking		D: Various driver hacking
	D: Lowlevel x86 kernel hacking		D: Lowlevel x86 kernel hacking
	D: General debugging		D: General debugging

Documentation/acpi-hotkey.txt

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -33,3 +33,6 @@ The result of the execution of this aml method is
	attached to /proc/acpi/hotkey/poll_method, which is dnyamically		attached to /proc/acpi/hotkey/poll_method, which is dnyamically
	created. Please use command "cat /proc/acpi/hotkey/polling_method"		created. Please use command "cat /proc/acpi/hotkey/polling_method"
	to retrieve it.		to retrieve it.

			Note: Use cmdline "acpi_generic_hotkey" to over-ride
			loading any platform specific drivers.

Documentation/kernel-parameters.txt

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -159,6 +159,11 @@ running once the system is up.

	acpi_fake_ecdt [HW,ACPI] Workaround failure due to BIOS lacking ECDT		acpi_fake_ecdt [HW,ACPI] Workaround failure due to BIOS lacking ECDT

			acpi_generic_hotkey [HW,ACPI]
			Allow consolidated generic hotkey driver to
			over-ride platform specific driver.
			See also Documentation/acpi-hotkey.txt.

	ad1816= [HW,OSS]		ad1816= [HW,OSS]
	Format: <io>,<irq>,<dma>,<dma2>		Format: <io>,<irq>,<dma>,<dma2>
	See also Documentation/sound/oss/AD1816.		See also Documentation/sound/oss/AD1816.

Documentation/pci.txt

+0 −14

Original line number	Original line	Diff line number	Diff line
	@@ -266,20 +266,6 @@ port an old driver to the new PCI interface. They are no longer present
	in the kernel as they aren't compatible with hotplug or PCI domains or		in the kernel as they aren't compatible with hotplug or PCI domains or
	having sane locking.		having sane locking.

	pcibios_present() and Since ages, you don't need to test presence
	pci_present() of PCI subsystem when trying to talk to it.
	If it's not there, the list of PCI devices
	is empty and all functions for searching for
	devices just return NULL.
	pcibios_(read\|write)_* Superseded by their pci_(read\|write)_*
	counterparts.
	pcibios_find_* Superseded by their pci_get_* counterparts.
	pci_for_each_dev() Superseded by pci_get_device()
	pci_for_each_dev_reverse() Superseded by pci_find_device_reverse()
	pci_for_each_bus() Superseded by pci_find_next_bus()
	pci_find_device() Superseded by pci_get_device()		pci_find_device() Superseded by pci_get_device()
	pci_find_subsys() Superseded by pci_get_subsys()		pci_find_subsys() Superseded by pci_get_subsys()
	pci_find_slot() Superseded by pci_get_slot()		pci_find_slot() Superseded by pci_get_slot()
	pcibios_find_class() Superseded by pci_get_class()
	pci_find_class() Superseded by pci_get_class()
	pci_(read\|write)__nodev() Superseded by pci_bus_(read\|write)_()

MAINTAINERS

+15 −3

Original line number	Original line	Diff line number	Diff line
	@@ -784,7 +784,7 @@ DVB SUBSYSTEM AND DRIVERS
	P: LinuxTV.org Project		P: LinuxTV.org Project
	M: linux-dvb-maintainer@linuxtv.org		M: linux-dvb-maintainer@linuxtv.org
	L: linux-dvb@linuxtv.org (subscription required)		L: linux-dvb@linuxtv.org (subscription required)
	W: http://linuxtv.org/developer/dvb.xml		W: http://linuxtv.org/
	S: Supported		S: Supported

	EATA-DMA SCSI DRIVER		EATA-DMA SCSI DRIVER
	@@ -1739,7 +1739,7 @@ S: Maintained

	OPL3-SA2, SA3, and SAx DRIVER		OPL3-SA2, SA3, and SAx DRIVER
	P: Zwane Mwaikambo		P: Zwane Mwaikambo
	M: zwane@commfireservices.com		M: zwane@arm.linux.org.uk
	L: linux-sound@vger.kernel.org		L: linux-sound@vger.kernel.org
	S: Maintained		S: Maintained

	@@ -1825,6 +1825,12 @@ P: Greg Kroah-Hartman
	M: greg@kroah.com		M: greg@kroah.com
	S: Maintained		S: Maintained

			PCIE HOTPLUG DRIVER
			P: Kristen Carlson Accardi
			M: kristen.c.accardi@intel.com
			L: pcihpd-discuss@lists.sourceforge.net
			S: Maintained

	PCMCIA SUBSYSTEM		PCMCIA SUBSYSTEM
	P: Linux PCMCIA Team		P: Linux PCMCIA Team
	L: http://lists.infradead.org/mailman/listinfo/linux-pcmcia		L: http://lists.infradead.org/mailman/listinfo/linux-pcmcia
	@@ -1989,7 +1995,7 @@ S: Maintained

	SC1200 WDT DRIVER		SC1200 WDT DRIVER
	P: Zwane Mwaikambo		P: Zwane Mwaikambo
	M: zwane@commfireservices.com		M: zwane@arm.linux.org.uk
	S: Maintained		S: Maintained

	SCHEDULER		SCHEDULER
	@@ -2201,6 +2207,12 @@ W: http://projects.buici.com/arm
	L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)		L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
	S: Maintained		S: Maintained

			SHPC HOTPLUG DRIVER
			P: Kristen Carlson Accardi
			M: kristen.c.accardi@intel.com
			L: pcihpd-discuss@lists.sourceforge.net
			S: Maintained

	SPARC (sparc32):		SPARC (sparc32):
	P: William L. Irwin		P: William L. Irwin
	M: wli@holomorphy.com		M: wli@holomorphy.com