diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-03 17:55:21 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-03 17:55:21 -0500 |
| commit | 04228460a3ded723b2da09141c76c45ddd712caf (patch) | |
| tree | db7b9143b150ead1e9fec10760a1d5ff4045a5e7 /MAINTAINERS | |
| parent | 7c0ab43e6ab09d72dc8dbac2521b2f819ccc4026 (diff) | |
| parent | 24c78557741395e038e83f25367cf2bfd7f582b8 (diff) | |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 4323f8fe38a6..7585e9dd835b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -405,7 +405,7 @@ S: Supported | |||
| 405 | F: drivers/usb/gadget/amd5536udc.* | 405 | F: drivers/usb/gadget/amd5536udc.* |
| 406 | 406 | ||
| 407 | AMD GEODE PROCESSOR/CHIPSET SUPPORT | 407 | AMD GEODE PROCESSOR/CHIPSET SUPPORT |
| 408 | P: Jordan Crouse | 408 | P: Andres Salomon <dilinger@queued.net> |
| 409 | L: linux-geode@lists.infradead.org (moderated for non-subscribers) | 409 | L: linux-geode@lists.infradead.org (moderated for non-subscribers) |
| 410 | W: http://www.amd.com/us-en/ConnectivitySolutions/TechnicalResources/0,,50_2334_2452_11363,00.html | 410 | W: http://www.amd.com/us-en/ConnectivitySolutions/TechnicalResources/0,,50_2334_2452_11363,00.html |
| 411 | S: Supported | 411 | S: Supported |
| @@ -4605,7 +4605,7 @@ F: drivers/pcmcia/ | |||
| 4605 | F: include/pcmcia/ | 4605 | F: include/pcmcia/ |
| 4606 | 4606 | ||
| 4607 | PCNET32 NETWORK DRIVER | 4607 | PCNET32 NETWORK DRIVER |
| 4608 | M: Don Fry <pcnet32@verizon.net> | 4608 | M: Don Fry <pcnet32@frontier.com> |
| 4609 | L: netdev@vger.kernel.org | 4609 | L: netdev@vger.kernel.org |
| 4610 | S: Maintained | 4610 | S: Maintained |
| 4611 | F: drivers/net/pcnet32.c | 4611 | F: drivers/net/pcnet32.c |