forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Just several instances of overlapping changes. Signed-off-by: David S. Miller <[email protected]>
- Loading branch information
Showing
276 changed files
with
2,475 additions
and
1,313 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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1694,8 +1694,6 @@ S: Maintained | |
F: drivers/edac/altera_edac. | ||
|
||
ARM/STI ARCHITECTURE | ||
M: Srinivas Kandagatla <[email protected]> | ||
M: Maxime Coquelin <[email protected]> | ||
M: Patrice Chotard <[email protected]> | ||
L: [email protected] (moderated for non-subscribers) | ||
L: [email protected] | ||
|
@@ -1728,6 +1726,7 @@ F: drivers/ata/ahci_st.c | |
|
||
ARM/STM32 ARCHITECTURE | ||
M: Maxime Coquelin <[email protected]> | ||
M: Alexandre Torgue <[email protected]> | ||
L: [email protected] (moderated for non-subscribers) | ||
S: Maintained | ||
T: git git://git.kernel.org/pub/scm/linux/kernel/git/mcoquelin/stm32.git | ||
|
@@ -4486,7 +4485,7 @@ S: Orphan | |
F: fs/efs/ | ||
|
||
EHEA (IBM pSeries eHEA 10Gb ethernet adapter) DRIVER | ||
M: Thadeu Lima de Souza Cascardo <cascardo@linux.vnet.ibm.com> | ||
M: Douglas Miller <dougmill@linux.vnet.ibm.com> | ||
L: [email protected] | ||
S: Maintained | ||
F: drivers/net/ethernet/ibm/ehea/ | ||
|
@@ -7502,6 +7501,7 @@ Q: http://patchwork.ozlabs.org/project/linux-mtd/list/ | |
T: git git://git.infradead.org/linux-mtd.git | ||
T: git git://git.infradead.org/l2-mtd.git | ||
S: Maintained | ||
F: Documentation/devicetree/bindings/mtd/ | ||
F: drivers/mtd/ | ||
F: include/linux/mtd/ | ||
F: include/uapi/mtd/ | ||
|
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
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.