forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge commit 'v2.6.36-rc7' into perf/core
Conflicts: arch/x86/kernel/module.c Merge reason: Resolve the conflict, pick up fixes. Signed-off-by: Ingo Molnar <[email protected]>
- Loading branch information
Showing
359 changed files
with
2,601 additions
and
1,390 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3554,12 +3554,12 @@ E: [email protected] | |
D: portions of the Linux Security Module (LSM) framework and security modules | ||
|
||
N: Petr Vandrovec | ||
E: [email protected] | ||
E: [email protected] | ||
D: Small contributions to ncpfs | ||
D: Matrox framebuffer driver | ||
S: Chudenicka 8 | ||
S: 10200 Prague 10, Hostivar | ||
S: Czech Republic | ||
S: 21513 Conradia Ct | ||
S: Cupertino, CA 95014 | ||
S: USA | ||
|
||
N: Thibaut Varene | ||
E: [email protected] | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -962,6 +962,13 @@ W: http://www.fluff.org/ben/linux/ | |
S: Maintained | ||
F: arch/arm/mach-s3c6410/ | ||
|
||
ARM/S5P ARM ARCHITECTURES | ||
M: Kukjin Kim <[email protected]> | ||
L: [email protected] (moderated for non-subscribers) | ||
L: [email protected] (moderated for non-subscribers) | ||
S: Maintained | ||
F: arch/arm/mach-s5p*/ | ||
|
||
ARM/SHMOBILE ARM ARCHITECTURE | ||
M: Paul Mundt <[email protected]> | ||
M: Magnus Damm <[email protected]> | ||
|
@@ -1220,15 +1227,15 @@ F: drivers/auxdisplay/ | |
F: include/linux/cfag12864b.h | ||
|
||
AVR32 ARCHITECTURE | ||
M: Haavard Skinnemoen <hskinnemoen@atmel.com> | ||
M: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com> | ||
W: http://www.atmel.com/products/AVR32/ | ||
W: http://avr32linux.org/ | ||
W: http://avrfreaks.net/ | ||
S: Supported | ||
F: arch/avr32/ | ||
|
||
AVR32/AT32AP MACHINE SUPPORT | ||
M: Haavard Skinnemoen <hskinnemoen@atmel.com> | ||
M: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com> | ||
S: Supported | ||
F: arch/avr32/mach-at32ap/ | ||
|
||
|
@@ -2199,6 +2206,12 @@ W: http://acpi4asus.sf.net | |
S: Maintained | ||
F: drivers/platform/x86/eeepc-laptop.c | ||
|
||
EFIFB FRAMEBUFFER DRIVER | ||
L: [email protected] | ||
M: Peter Jones <[email protected]> | ||
S: Maintained | ||
F: drivers/video/efifb.c | ||
|
||
EFS FILESYSTEM | ||
W: http://aeschi.ch.eu.org/efs/ | ||
S: Orphan | ||
|
@@ -2662,6 +2675,8 @@ M: Guenter Roeck <[email protected]> | |
L: [email protected] | ||
W: http://www.lm-sensors.org/ | ||
T: quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-hwmon/ | ||
T: quilt kernel.org/pub/linux/kernel/people/groeck/linux-staging/ | ||
T: git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git | ||
S: Maintained | ||
F: Documentation/hwmon/ | ||
F: drivers/hwmon/ | ||
|
@@ -3773,9 +3788,8 @@ W: http://www.syskonnect.com | |
S: Supported | ||
|
||
MATROX FRAMEBUFFER DRIVER | ||
M: Petr Vandrovec <[email protected]> | ||
L: [email protected] | ||
S: Maintained | ||
S: Orphan | ||
F: drivers/video/matrox/matroxfb_* | ||
F: include/linux/matroxfb.h | ||
|
||
|
@@ -3899,10 +3913,8 @@ F: Documentation/serial/moxa-smartio | |
F: drivers/char/mxser.* | ||
|
||
MSI LAPTOP SUPPORT | ||
M: Lennart Poettering <[email protected]> | ||
M: Lee, Chun-Yi <[email protected]> | ||
L: [email protected] | ||
W: https://tango.0pointer.de/mailman/listinfo/s270-linux | ||
W: http://0pointer.de/lennart/tchibo.html | ||
S: Maintained | ||
F: drivers/platform/x86/msi-laptop.c | ||
|
||
|
@@ -3919,8 +3931,10 @@ S: Supported | |
F: drivers/mfd/ | ||
|
||
MULTIMEDIA CARD (MMC), SECURE DIGITAL (SD) AND SDIO SUBSYSTEM | ||
S: Orphan | ||
M: Chris Ball <[email protected]> | ||
L: [email protected] | ||
T: git git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git | ||
S: Maintained | ||
F: drivers/mmc/ | ||
F: include/linux/mmc/ | ||
|
||
|
@@ -3962,8 +3976,8 @@ S: Maintained | |
F: drivers/net/natsemi.c | ||
|
||
NCP FILESYSTEM | ||
M: Petr Vandrovec <[email protected]> | ||
S: Maintained | ||
M: Petr Vandrovec <[email protected]> | ||
S: Odd Fixes | ||
F: fs/ncpfs/ | ||
|
||
NCR DUAL 700 SCSI DRIVER (MICROCHANNEL) | ||
|
@@ -5091,8 +5105,10 @@ S: Maintained | |
F: drivers/mmc/host/sdricoh_cs.c | ||
|
||
SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) DRIVER | ||
S: Orphan | ||
M: Chris Ball <[email protected]> | ||
L: [email protected] | ||
T: git git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git | ||
S: Maintained | ||
F: drivers/mmc/host/sdhci.* | ||
|
||
SECURE DIGITAL HOST CONTROLLER INTERFACE, OPEN FIRMWARE BINDINGS (SDHCI-OF) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.