Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33ee375b authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into x86/gart

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


Detecting drive failures:
Detecting drive failures:
-------------------------
-------------------------
+1 −0
Original line number Original line Diff line number Diff line
@@ -36,6 +36,7 @@ files, each with their own function.
       local_cpus	   nearby CPU mask (cpumask, ro)
       local_cpus	   nearby CPU mask (cpumask, ro)
       resource		   PCI resource host addresses (ascii, ro)
       resource		   PCI resource host addresses (ascii, ro)
       resource0..N	   PCI resource N, if present (binary, mmap)
       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)
       rom		   PCI ROM resource, if present (binary, ro)
       subsystem_device	   PCI subsystem device (ascii, ro)
       subsystem_device	   PCI subsystem device (ascii, ro)
       subsystem_vendor	   PCI subsystem vendor (ascii, ro)
       subsystem_vendor	   PCI subsystem vendor (ascii, ro)
+1 −1
Original line number Original line 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
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,
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.
kobject) in their parent.


As a kset contains a kobject within it, it should always be dynamically
As a kset contains a kobject within it, it should always be dynamically
+1 −1
Original line number Original line 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
In addition to the EV_KEY events, thinkpad-acpi may also issue EV_SW
events for switches:
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
SW_TABLET_MODE	Tablet ThinkPads HKEY events 0x5009 and 0x500A


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


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


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


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


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


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


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


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


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


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


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


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


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


PXA2xx SUPPORT
PXA2xx/PXA3xx SUPPORT
P:	Nicolas Pitre
P:	Eric Miao
M:	nico@cam.org
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)
L:	linux-arm-kernel@lists.arm.linux.org.uk	(subscribers-only)
S:	Maintained
S:	Maintained


@@ -3658,13 +3661,6 @@ M: romieu@fr.zoreil.com
L:	netdev@vger.kernel.org
L:	netdev@vger.kernel.org
S:	Maintained
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
SIS 900/7016 FAST ETHERNET DRIVER
P:	Daniele Venzano
P:	Daniele Venzano
M:	venza@brownhat.org
M:	venza@brownhat.org
@@ -4030,7 +4026,7 @@ TULIP NETWORK DRIVERS
P:	Grant Grundler
P:	Grant Grundler
M:	grundler@parisc-linux.org
M:	grundler@parisc-linux.org
P:	Kyle McMartin
P:	Kyle McMartin
M:	kyle@parisc-linux.org
M:	kyle@mcmartin.ca
L:	netdev@vger.kernel.org
L:	netdev@vger.kernel.org
S:	Maintained
S:	Maintained


Loading