Skip to content

Commit 9514822

Browse files
davem330davem330
committed
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/next-organize
2 parents efe3d3c + 88f0748 commit 9514822

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

128 files changed

+736
-645
lines changed

‎MAINTAINERS

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2113,7 +2113,7 @@ F: net/decnet/
21132113
DEFXX FDDI NETWORK DRIVER
21142114
M: "Maciej W. Rozycki" <macro@linux-mips.org>
21152115
S: Maintained
2116-
F: drivers/net/defxx.*
2116+
F: drivers/net/fddi/defxx.*
21172117

21182118
DELL LAPTOP DRIVER
21192119
M: Matthew Garrett <mjg59@srcf.ucam.org>
@@ -3049,6 +3049,7 @@ S: Maintained
30493049
F: include/linux/hippidevice.h
30503050
F: include/linux/if_hippi.h
30513051
F: net/802/hippi.c
3052+
F: drivers/net/hippi/
30523053

30533054
HOST AP DRIVER
30543055
M: Jouni Malinen <j@w1.fi>
@@ -5066,7 +5067,7 @@ PPP PROTOCOL DRIVERS AND COMPRESSORS
50665067
M: Paul Mackerras <paulus@samba.org>
50675068
L: linux-ppp@vger.kernel.org
50685069
S: Maintained
5069-
F: drivers/net/ppp_*
5070+
F: drivers/net/ppp/ppp_*
50705071

50715072
PPP OVER ATM (RFC 2364)
50725073
M: Mitchell Blank Jr <mitch@sfgoth.com>
@@ -5077,8 +5078,8 @@ F: include/linux/atmppp.h
50775078
PPP OVER ETHERNET
50785079
M: Michal Ostrowski <mostrows@earthlink.net>
50795080
S: Maintained
5080-
F: drivers/net/pppoe.c
5081-
F: drivers/net/pppox.c
5081+
F: drivers/net/ppp/pppoe.c
5082+
F: drivers/net/ppp/pppox.c
50825083

50835084
PPP OVER L2TP
50845085
M: James Chapman <jchapman@katalix.com>
@@ -5099,7 +5100,7 @@ PPTP DRIVER
50995100
M: Dmitry Kozlov <xeb@mail.ru>
51005101
L: netdev@vger.kernel.org
51015102
S: Maintained
5102-
F: drivers/net/pptp.c
5103+
F: drivers/net/ppp/pptp.c
51035104
W: http://sourceforge.net/projects/accel-pptp
51045105

51055106
PREEMPTIBLE KERNEL

0 commit comments

Comments
 (0)