summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2011-05-25 04:13:22 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-25 19:39:49 +0400
commit5ff77428e55c152ef75a6967f3266db79926fbde (patch)
tree8254c7a6d482fbb142f885f564e8180cd43c953f
parent8007798f55523940bee14fb0cb2d798a2531c827 (diff)
downloadlinux-5ff77428e55c152ef75a6967f3266db79926fbde.tar.xz
MAINTAINERS: orphan DMFE, move Tobias Ringstrom to CREDITS
Tobias's email bounces and he hasn't submitted or acked a patch in git history. Signed-off-by: Joe Perches <joe@perches.com> Cc: David Miller <davem@davemloft.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-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
S: 70110 Kuopio
S: Finland
+N: Tobias Ringström
+E: tori@unhappy.mine.nu
+D: Davicom DM9102(A)/DM9132/DM9801 fast ethernet driver
+
N: Luca Risolia
E: luca.risolia@studio.unibo.it
P: 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
F: net/ax25/sysctl_net_ax25.c
DAVICOM FAST ETHERNET (DMFE) NETWORK DRIVER
-M: Tobias Ringstrom <tori@unhappy.mine.nu>
L: netdev@vger.kernel.org
-S: Maintained
+S: Orphan
F: Documentation/networking/dmfe.txt
F: drivers/net/tulip/dmfe.c