diff --git a/[refs] b/[refs] index 84d8f0852d64..d7f04ec669b1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 32a4ec97461f00aa63747fc8978011ea771bd543 +refs/heads/master: 3bb8a18ae825ebf3550fe7894b35cd1c87356a16 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 76dc820bc889..270e28c0506a 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -1697,7 +1697,6 @@ S: Maintained MARVELL MV64340 ETHERNET DRIVER P: Manish Lachwani -M: Manish_Lachwani@pmc-sierra.com L: linux-mips@linux-mips.org L: netdev@vger.kernel.org S: Supported diff --git a/trunk/drivers/net/mv643xx_eth.c b/trunk/drivers/net/mv643xx_eth.c index 3cb9b3fe0cf1..22c3a37bba5a 100644 --- a/trunk/drivers/net/mv643xx_eth.c +++ b/trunk/drivers/net/mv643xx_eth.c @@ -6,7 +6,7 @@ * Copyright (C) 2002 rabeeh@galileo.co.il * * Copyright (C) 2003 PMC-Sierra, Inc., - * written by Manish Lachwani (lachwani@pmc-sierra.com) + * written by Manish Lachwani * * Copyright (C) 2003 Ralf Baechle *