diff options
| author | Tejun Heo <tj@kernel.org> | 2010-12-27 12:10:25 +0100 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2010-12-27 12:10:25 +0100 |
| commit | b924047fe07689ed9b7f0a8e14826534caaff8fc (patch) | |
| tree | 7701c5e7ad7cb176d82f9b88304cd99cbbc8ae4a /MAINTAINERS | |
| parent | 7c83912062c801738d7d19acaf8f7fec25ea663c (diff) | |
| parent | d7c1255a3a21e98bdc64df8ccf005a174d7e6289 (diff) | |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index cc27793e8756..bd2d5f08908f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -405,7 +405,7 @@ S: Supported F: drivers/usb/gadget/amd5536udc.* AMD GEODE PROCESSOR/CHIPSET SUPPORT -P: Jordan Crouse +P: Andres Salomon <dilinger@queued.net> L: linux-geode@lists.infradead.org (moderated for non-subscribers) W: http://www.amd.com/us-en/ConnectivitySolutions/TechnicalResources/0,,50_2334_2452_11363,00.html S: Supported @@ -4590,7 +4590,7 @@ F: drivers/pcmcia/ F: include/pcmcia/ PCNET32 NETWORK DRIVER -M: Don Fry <pcnet32@verizon.net> +M: Don Fry <pcnet32@frontier.com> L: netdev@vger.kernel.org S: Maintained F: drivers/net/pcnet32.c |