diff --git a/[refs] b/[refs] index 5d7f1452007b..8c027fda62ee 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8007798f55523940bee14fb0cb2d798a2531c827 +refs/heads/master: 5ff77428e55c152ef75a6967f3266db79926fbde diff --git a/trunk/CREDITS b/trunk/CREDITS index 95c469c610bc..58d2a02add39 100644 --- a/trunk/CREDITS +++ b/trunk/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/trunk/MAINTAINERS b/trunk/MAINTAINERS index 7350cefa1aef..59cd2f5a1122 100644 --- a/trunk/MAINTAINERS +++ b/trunk/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 L: netdev@vger.kernel.org -S: Maintained +S: Orphan F: Documentation/networking/dmfe.txt F: drivers/net/tulip/dmfe.c