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.32-rc7' into perf/core
Merge reason: pick up perf fixlets Signed-off-by: Ingo Molnar <[email protected]>
- Loading branch information
Showing
382 changed files
with
7,011 additions
and
3,646 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
Large diffs are not rendered by default.
Oops, something went wrong.
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 |
---|---|---|
|
@@ -182,7 +182,7 @@ M: Ron Minnich <[email protected]> | |
M: Latchesar Ionkov <[email protected]> | ||
L: [email protected] | ||
W: http://swik.net/v9fs | ||
T: git git://git.kernel.org/pub/scm/linux/kernel/ericvh/v9fs.git | ||
T: git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git | ||
S: Maintained | ||
F: Documentation/filesystems/9p.txt | ||
F: fs/9p/ | ||
|
@@ -906,7 +906,6 @@ M: Karol Kozimor <[email protected]> | |
L: [email protected] | ||
W: http://acpi4asus.sf.net | ||
S: Maintained | ||
F: arch/x86/kernel/acpi/boot.c | ||
F: drivers/platform/x86/asus_acpi.c | ||
|
||
ASUS ASB100 HARDWARE MONITOR DRIVER | ||
|
@@ -1245,11 +1244,10 @@ S: Supported | |
F: drivers/net/tg3.* | ||
|
||
BROCADE BFA FC SCSI DRIVER | ||
P: Jing Huang | ||
M: [email protected] | ||
L: [email protected] | ||
S: Supported | ||
F: drivers/scsi/bfa/ | ||
M: Jing Huang <[email protected]> | ||
L: [email protected] | ||
S: Supported | ||
F: drivers/scsi/bfa/ | ||
|
||
BSG (block layer generic sg v4 driver) | ||
M: FUJITA Tomonori <[email protected]> | ||
|
@@ -2825,7 +2823,7 @@ F: drivers/infiniband/hw/ipath/ | |
|
||
IPMI SUBSYSTEM | ||
M: Corey Minyard <[email protected]> | ||
L: [email protected] | ||
L: [email protected] (moderated for non-subscribers) | ||
W: http://openipmi.sourceforge.net/ | ||
S: Supported | ||
F: Documentation/IPMI.txt | ||
|
@@ -3618,7 +3616,7 @@ L: [email protected] | |
L: [email protected] | ||
W: http://www.netfilter.org/ | ||
W: http://www.iptables.org/ | ||
T: git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6.git | ||
T: git git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6.git | ||
S: Supported | ||
F: include/linux/netfilter* | ||
F: include/linux/netfilter/ | ||
|
@@ -3665,6 +3663,7 @@ L: [email protected] | |
W: http://www.linuxfoundation.org/en/Net | ||
W: http://patchwork.ozlabs.org/project/netdev/list/ | ||
T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git | ||
T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6.git | ||
S: Maintained | ||
F: net/ | ||
F: include/net/ | ||
|
@@ -4636,7 +4635,7 @@ F: drivers/mmc/host/sdhci-s3c.c | |
SECURITY SUBSYSTEM | ||
M: James Morris <[email protected]> | ||
L: [email protected] (suggested Cc:) | ||
T: git git://www.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git | ||
T: git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git | ||
W: http://security.wiki.kernel.org/ | ||
S: Supported | ||
F: security/ | ||
|
@@ -4672,12 +4671,11 @@ F: include/linux/ata.h | |
F: include/linux/libata.h | ||
|
||
SERVER ENGINES 10Gbps iSCSI - BladeEngine 2 DRIVER | ||
P: Jayamohan Kallickal | ||
M: [email protected] | ||
L: [email protected] | ||
W: http://www.serverengines.com | ||
S: Supported | ||
F: drivers/scsi/be2iscsi/ | ||
M: Jayamohan Kallickal <[email protected]> | ||
L: [email protected] | ||
W: http://www.serverengines.com | ||
S: Supported | ||
F: drivers/scsi/be2iscsi/ | ||
|
||
SERVER ENGINES 10Gbps NIC - BladeEngine 2 DRIVER | ||
M: Sathya Perla <[email protected]> | ||
|
@@ -5683,11 +5681,11 @@ F: drivers/vlynq/vlynq.c | |
F: include/linux/vlynq.h | ||
|
||
VMWARE VMXNET3 ETHERNET DRIVER | ||
M: Shreyas Bhatewara <[email protected]> | ||
M: VMware, Inc. <[email protected]> | ||
L: [email protected] | ||
S: Maintained | ||
F: drivers/net/vmxnet3/ | ||
M: Shreyas Bhatewara <[email protected]> | ||
M: "VMware, Inc." <[email protected]> | ||
L: [email protected] | ||
S: Maintained | ||
F: drivers/net/vmxnet3/ | ||
|
||
VOLTAGE AND CURRENT REGULATOR FRAMEWORK | ||
M: Liam Girdwood <[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
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.