diff options
| author | David S. Miller <davem@davemloft.net> | 2008-10-31 02:35:23 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-31 02:35:23 -0400 |
| commit | 19b8cba2e8539e3b8022316f94837d8f242b8f80 (patch) | |
| tree | 9107cfa055ce927a3fdbb706e04ef2481faeb410 /MAINTAINERS | |
| parent | 263e69cbc9e5a9e7bcf6a24f641ef0717d1ae4df (diff) | |
| parent | adef199c61a224703dfa95c69d360c793ab2ea97 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 43de305c3213..d643e862b8e4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -743,6 +743,8 @@ P: Nick Kossifidis | |||
| 743 | M: mickflemm@gmail.com | 743 | M: mickflemm@gmail.com |
| 744 | P: Luis R. Rodriguez | 744 | P: Luis R. Rodriguez |
| 745 | M: mcgrof@gmail.com | 745 | M: mcgrof@gmail.com |
| 746 | P: Bob Copeland | ||
| 747 | M: me@bobcopeland.com | ||
| 746 | L: linux-wireless@vger.kernel.org | 748 | L: linux-wireless@vger.kernel.org |
| 747 | L: ath5k-devel@lists.ath5k.org | 749 | L: ath5k-devel@lists.ath5k.org |
| 748 | S: Maintained | 750 | S: Maintained |