forked from analogdevicesinc/linux
-
Notifications
You must be signed in to change notification settings - Fork 3
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
Conflicts: drivers/net/ethernet/cadence/macb.c drivers/net/phy/phy.c include/linux/skbuff.h net/ipv4/tcp.c net/switchdev/switchdev.c Switchdev was a case of RTNH_H_{EXTERNAL --> OFFLOAD} renaming overlapping with net-next changes of various sorts. phy.c was a case of two changes, one adding a local variable to a function whilst the second was removing one. tcp.c overlapped a deadlock fix with the addition of new tcp_info statistic values. macb.c involved the addition of two zyncq device entries. skbuff.h involved adding back ipv4_daddr to nf_bridge_info whilst net-next changes put two other existing members of that struct into a union. Signed-off-by: David S. Miller <[email protected]>
- Loading branch information
Showing
339 changed files
with
2,236 additions
and
1,370 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
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 |
---|---|---|
|
@@ -973,7 +973,7 @@ S: Maintained | |
ARM/CORTINA SYSTEMS GEMINI ARM ARCHITECTURE | ||
M: Hans Ulli Kroll <[email protected]> | ||
L: [email protected] (moderated for non-subscribers) | ||
T: git git://git.berlios.de/gemini-board | ||
T: git git://github.com/ulli-kroll/linux.git | ||
S: Maintained | ||
F: arch/arm/mach-gemini/ | ||
|
||
|
@@ -1192,7 +1192,7 @@ ARM/MAGICIAN MACHINE SUPPORT | |
M: Philipp Zabel <[email protected]> | ||
S: Maintained | ||
|
||
ARM/Marvell Armada 370 and Armada XP SOC support | ||
ARM/Marvell Kirkwood and Armada 370, 375, 38x, XP SOC support | ||
M: Jason Cooper <[email protected]> | ||
M: Andrew Lunn <[email protected]> | ||
M: Gregory Clement <[email protected]> | ||
|
@@ -1201,12 +1201,17 @@ L: [email protected] (moderated for non-subscribers) | |
S: Maintained | ||
F: arch/arm/mach-mvebu/ | ||
F: drivers/rtc/rtc-armada38x.c | ||
F: arch/arm/boot/dts/armada* | ||
F: arch/arm/boot/dts/kirkwood* | ||
|
||
|
||
ARM/Marvell Berlin SoC support | ||
M: Sebastian Hesselbarth <[email protected]> | ||
L: [email protected] (moderated for non-subscribers) | ||
S: Maintained | ||
F: arch/arm/mach-berlin/ | ||
F: arch/arm/boot/dts/berlin* | ||
|
||
|
||
ARM/Marvell Dove/MV78xx0/Orion SOC support | ||
M: Jason Cooper <[email protected]> | ||
|
@@ -1219,6 +1224,9 @@ F: arch/arm/mach-dove/ | |
F: arch/arm/mach-mv78xx0/ | ||
F: arch/arm/mach-orion5x/ | ||
F: arch/arm/plat-orion/ | ||
F: arch/arm/boot/dts/dove* | ||
F: arch/arm/boot/dts/orion5x* | ||
|
||
|
||
ARM/Orion SoC/Technologic Systems TS-78xx platform support | ||
M: Alexander Clouter <[email protected]> | ||
|
@@ -1370,6 +1378,7 @@ N: rockchip | |
|
||
ARM/SAMSUNG EXYNOS ARM ARCHITECTURES | ||
M: Kukjin Kim <[email protected]> | ||
M: Krzysztof Kozlowski <[email protected]> | ||
L: [email protected] (moderated for non-subscribers) | ||
L: [email protected] (moderated for non-subscribers) | ||
S: Maintained | ||
|
@@ -1934,7 +1943,7 @@ S: Maintained | |
F: drivers/net/wireless/b43legacy/ | ||
|
||
BACKLIGHT CLASS/SUBSYSTEM | ||
M: Jingoo Han <jg1.han@samsung.com> | ||
M: Jingoo Han <jingoohan1@gmail.com> | ||
M: Lee Jones <[email protected]> | ||
S: Maintained | ||
F: drivers/video/backlight/ | ||
|
@@ -3917,7 +3926,7 @@ F: drivers/extcon/ | |
F: Documentation/extcon/ | ||
|
||
EXYNOS DP DRIVER | ||
M: Jingoo Han <jg1.han@samsung.com> | ||
M: Jingoo Han <jingoohan1@gmail.com> | ||
L: [email protected] | ||
S: Maintained | ||
F: drivers/gpu/drm/exynos/exynos_dp* | ||
|
@@ -4526,7 +4535,7 @@ M: Jean Delvare <[email protected]> | |
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 http://jdelvare.nerim.net/devel/linux/jdelvare-hwmon/ | ||
T: git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git | ||
S: Maintained | ||
F: Documentation/hwmon/ | ||
|
@@ -7556,15 +7565,15 @@ S: Maintained | |
F: drivers/pci/host/*rcar* | ||
|
||
PCI DRIVER FOR SAMSUNG EXYNOS | ||
M: Jingoo Han <jg1.han@samsung.com> | ||
M: Jingoo Han <jingoohan1@gmail.com> | ||
L: [email protected] | ||
L: [email protected] (moderated for non-subscribers) | ||
L: [email protected] (moderated for non-subscribers) | ||
S: Maintained | ||
F: drivers/pci/host/pci-exynos.c | ||
|
||
PCI DRIVER FOR SYNOPSIS DESIGNWARE | ||
M: Jingoo Han <jg1.han@samsung.com> | ||
M: Jingoo Han <jingoohan1@gmail.com> | ||
L: [email protected] | ||
S: Maintained | ||
F: drivers/pci/host/*designware* | ||
|
@@ -8520,7 +8529,7 @@ S: Supported | |
F: sound/soc/samsung/ | ||
|
||
SAMSUNG FRAMEBUFFER DRIVER | ||
M: Jingoo Han <jg1.han@samsung.com> | ||
M: Jingoo Han <jingoohan1@gmail.com> | ||
L: [email protected] | ||
S: Maintained | ||
F: drivers/video/fbdev/s3c-fb.c | ||
|
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.