diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-06 08:57:15 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-06 08:57:15 -0400 |
| commit | 71ec63c5d66b577a71910b82740751be73e81310 (patch) | |
| tree | 8a3b7b4fd4068fae1b2fd7ab15e29645daa524f8 /MAINTAINERS | |
| parent | 627add2d1385394d020c84533c91ad26bc37b166 (diff) | |
| parent | 120bda20c6f64b32e8bfbdd7b34feafaa5f5332e (diff) | |
Merge branch 'master'
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 801829dee742..cf8fd4589748 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -2057,9 +2057,10 @@ L: linux-kernel@vger.kernel.org | |||
| 2057 | S: Maintained | 2057 | S: Maintained |
| 2058 | 2058 | ||
| 2059 | NI5010 NETWORK DRIVER | 2059 | NI5010 NETWORK DRIVER |
| 2060 | P: Jan-Pascal van Best and Andreas Mohr | 2060 | P: Jan-Pascal van Best |
| 2061 | M: Jan-Pascal van Best <jvbest@qv3pluto.leidenuniv.nl> | 2061 | M: janpascal@vanbest.org |
| 2062 | M: Andreas Mohr <100.30936@germany.net> | 2062 | P: Andreas Mohr |
| 2063 | M: andi@lisas.de | ||
| 2063 | L: netdev@vger.kernel.org | 2064 | L: netdev@vger.kernel.org |
| 2064 | S: Maintained | 2065 | S: Maintained |
| 2065 | 2066 | ||