aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CREDITS4
-rw-r--r--MAINTAINERS3
2 files changed, 5 insertions, 2 deletions
diff --git a/CREDITS b/CREDITS
index 95c469c610bc..58d2a02add39 100644
--- a/CREDITS
+++ b/CREDITS
@@ -2943,6 +2943,10 @@ S: Kasarmikatu 11 A4
2943S: 70110 Kuopio 2943S: 70110 Kuopio
2944S: Finland 2944S: Finland
2945 2945
2946N: Tobias Ringström
2947E: tori@unhappy.mine.nu
2948D: Davicom DM9102(A)/DM9132/DM9801 fast ethernet driver
2949
2946N: Luca Risolia 2950N: Luca Risolia
2947E: luca.risolia@studio.unibo.it 2951E: luca.risolia@studio.unibo.it
2948P: 1024D/FCE635A4 88E8 F32F 7244 68BA 3958 5D40 99DA 5D2A FCE6 35A4 2952P: 1024D/FCE635A4 88E8 F32F 7244 68BA 3958 5D40 99DA 5D2A FCE6 35A4
diff --git a/MAINTAINERS b/MAINTAINERS
index 7350cefa1aef..59cd2f5a1122 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2034,9 +2034,8 @@ F: net/ax25/ax25_timer.c
2034F: net/ax25/sysctl_net_ax25.c 2034F: net/ax25/sysctl_net_ax25.c
2035 2035
2036DAVICOM FAST ETHERNET (DMFE) NETWORK DRIVER 2036DAVICOM FAST ETHERNET (DMFE) NETWORK DRIVER
2037M: Tobias Ringstrom <tori@unhappy.mine.nu>
2038L: netdev@vger.kernel.org 2037L: netdev@vger.kernel.org
2039S: Maintained 2038S: Orphan
2040F: Documentation/networking/dmfe.txt 2039F: Documentation/networking/dmfe.txt
2041F: drivers/net/tulip/dmfe.c 2040F: drivers/net/tulip/dmfe.c
2042 2041