diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-01-04 02:08:51 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-01-04 02:08:54 -0500 |
| commit | cc2221969906a166a638aecdbae84a3d0462719e (patch) | |
| tree | 2483f726e226c309207e1d0250660eea6e1787b8 /MAINTAINERS | |
| parent | 56f4c400349157289b474a3fd49ee96acab0a4d7 (diff) | |
| parent | 387c31c7e5c9805b0aef8833d1731a5fe7bdea14 (diff) | |
Merge commit 'v2.6.37-rc8' into perf/core
Merge reason: pick up latest -rc.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index f1f803c6674a..92e5b67105f0 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 |
| @@ -4590,7 +4590,7 @@ F: drivers/pcmcia/ | |||
| 4590 | F: include/pcmcia/ | 4590 | F: include/pcmcia/ |
| 4591 | 4591 | ||
| 4592 | PCNET32 NETWORK DRIVER | 4592 | PCNET32 NETWORK DRIVER |
| 4593 | M: Don Fry <pcnet32@verizon.net> | 4593 | M: Don Fry <pcnet32@frontier.com> |
| 4594 | L: netdev@vger.kernel.org | 4594 | L: netdev@vger.kernel.org |
| 4595 | S: Maintained | 4595 | S: Maintained |
| 4596 | F: drivers/net/pcnet32.c | 4596 | F: drivers/net/pcnet32.c |