Merge branch 'linus' into x86/gart (33ee375b) · Commits · e / devices / android_kernel_fairphone_FP5

Documentation/cciss.txt

+5 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,11 @@ This driver is known to work with the following cards:
		* SA E200
		* SA E200i
		* SA E500
		* SA P212
		* SA P410
		* SA P410i
		* SA P411
		* SA P812

		Detecting drive failures:
		-------------------------

Documentation/filesystems/sysfs-pci.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -36,6 +36,7 @@ files, each with their own function.
		local_cpus nearby CPU mask (cpumask, ro)
		resource PCI resource host addresses (ascii, ro)
		resource0..N PCI resource N, if present (binary, mmap)
		resource0_wc..N_wc PCI WC map resource N, if prefetchable (binary, mmap)
		rom PCI ROM resource, if present (binary, ro)
		subsystem_device PCI subsystem device (ascii, ro)
		subsystem_vendor PCI subsystem vendor (ascii, ro)

Documentation/kobject.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -305,7 +305,7 @@ should not be manipulated by any other user.

		A kset keeps its children in a standard kernel linked list. Kobjects point
		back to their containing kset via their kset field. In almost all cases,
		the kobjects belonging to a ket have that kset (or, strictly, its embedded
		the kobjects belonging to a kset have that kset (or, strictly, its embedded
		kobject) in their parent.

		As a kset contains a kobject within it, it should always be dynamically

Documentation/laptops/thinkpad-acpi.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -503,7 +503,7 @@ generate input device EV_KEY events.
		In addition to the EV_KEY events, thinkpad-acpi may also issue EV_SW
		events for switches:

		SW_RADIO T60 and later hardare rfkill rocker switch
		SW_RFKILL_ALL T60 and later hardare rfkill rocker switch
		SW_TABLET_MODE Tablet ThinkPads HKEY events 0x5009 and 0x500A

		Non hot-key ACPI HKEY event map:

MAINTAINERS

+17 −21

Original line number	Diff line number	Diff line
		@@ -228,21 +228,21 @@ ACPI BATTERY DRIVERS
		P: Alexey Starikovskiy
		M: astarikovskiy@suse.de
		L: linux-acpi@vger.kernel.org
		W: http://acpi.sourceforge.net/
		W: http://www.lesswatts.org/projects/acpi/
		S: Supported

		ACPI EC DRIVER
		P: Alexey Starikovskiy
		M: astarikovskiy@suse.de
		L: linux-acpi@vger.kernel.org
		W: http://acpi.sourceforge.net/
		W: http://www.lesswatts.org/projects/acpi/
		S: Supported

		ACPI FAN DRIVER
		P: Len Brown
		M: len.brown@intel.com
		L: linux-acpi@vger.kernel.org
		W: http://acpi.sourceforge.net/
		W: http://www.lesswatts.org/projects/acpi/
		S: Supported

		ACPI PCI HOTPLUG DRIVER
		@@ -255,14 +255,14 @@ ACPI THERMAL DRIVER
		P: Len Brown
		M: len.brown@intel.com
		L: linux-acpi@vger.kernel.org
		W: http://acpi.sourceforge.net/
		W: http://www.lesswatts.org/projects/acpi/
		S: Supported

		ACPI VIDEO DRIVER
		P: Rui Zhang
		M: rui.zhang@intel.com
		L: linux-acpi@vger.kernel.org
		W: http://acpi.sourceforge.net/
		W: http://www.lesswatts.org/projects/acpi/
		S: Supported

		ACPI WMI DRIVER
		@@ -274,7 +274,7 @@ S: Maintained

		AD1889 ALSA SOUND DRIVER
		P: Kyle McMartin
		M: kyle@parisc-linux.org
		M: kyle@mcmartin.ca
		P: Thibaut Varene
		M: T-Bone@parisc-linux.org
		W: http://wiki.parisc-linux.org/AD1889
		@@ -995,8 +995,8 @@ L: netdev@vger.kernel.org
		S: Supported

		BROADCOM BNX2X 10 GIGABIT ETHERNET DRIVER
		P: Eliezer Tamir
		M: eliezert@broadcom.com
		P: Eilon Greenstein
		M: eilong@broadcom.com
		L: netdev@vger.kernel.org
		S: Supported

		@@ -1202,6 +1202,7 @@ M: pj@sgi.com
		M: menage@google.com
		L: linux-kernel@vger.kernel.org
		W: http://www.bullopensource.org/cpuset/
		W: http://oss.sgi.com/projects/cpusets/
		S: Supported

		CRAMFS FILESYSTEM
		@@ -1827,7 +1828,7 @@ S: Maintained

		HARMONY SOUND DRIVER
		P: Kyle McMartin
		M: kyle@parisc-linux.org
		M: kyle@mcmartin.ca
		L: linux-parisc@vger.kernel.org
		S: Maintained

		@@ -3120,7 +3121,7 @@ S: Maintained

		PARISC ARCHITECTURE
		P: Kyle McMartin
		M: kyle@parisc-linux.org
		M: kyle@mcmartin.ca
		P: Matthew Wilcox
		M: matthew@wil.cx
		P: Grant Grundler
		@@ -3329,9 +3330,11 @@ L: video4linux-list@redhat.com
		W: http://www.isely.net/pvrusb2/
		S: Maintained

		PXA2xx SUPPORT
		P: Nicolas Pitre
		M: nico@cam.org
		PXA2xx/PXA3xx SUPPORT
		P: Eric Miao
		M: eric.miao@marvell.com
		P: Russell King
		M: linux@arm.linux.org.uk
		L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
		S: Maintained

		@@ -3658,13 +3661,6 @@ M: romieu@fr.zoreil.com
		L: netdev@vger.kernel.org
		S: Maintained

		SIS 5513 IDE CONTROLLER DRIVER
		P: Lionel Bouton
		M: Lionel.Bouton@inet6.fr
		W: http://inet6.dyn.dhs.org/sponsoring/sis5513/index.html
		W: http://gyver.homeip.net/sis5513/index.html
		S: Maintained

		SIS 900/7016 FAST ETHERNET DRIVER
		P: Daniele Venzano
		M: venza@brownhat.org
		@@ -4030,7 +4026,7 @@ TULIP NETWORK DRIVERS
		P: Grant Grundler
		M: grundler@parisc-linux.org
		P: Kyle McMartin
		M: kyle@parisc-linux.org
		M: kyle@mcmartin.ca
		L: netdev@vger.kernel.org
		S: Maintained