diff options
| author | David S. Miller <davem@davemloft.net> | 2010-08-06 16:30:43 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-08-06 16:30:43 -0400 |
| commit | e225567960db50e9810a152c8621c7a6ed94de71 (patch) | |
| tree | d0129e2988f8aea56d4f00f04c4818c2e8cc07a2 /MAINTAINERS | |
| parent | 4b030d4288a569d6bdeca884d7f102d951f097f2 (diff) | |
| parent | a24d52f390a77ce90dc8cf0cd75d27ec0a6ea3f8 (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 | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 88ec0447a4f3..44620aebb369 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -1087,7 +1087,6 @@ F: drivers/net/wireless/ath/ath5k/ | |||
| 1087 | ATHEROS ATH9K WIRELESS DRIVER | 1087 | ATHEROS ATH9K WIRELESS DRIVER |
| 1088 | M: "Luis R. Rodriguez" <lrodriguez@atheros.com> | 1088 | M: "Luis R. Rodriguez" <lrodriguez@atheros.com> |
| 1089 | M: Jouni Malinen <jmalinen@atheros.com> | 1089 | M: Jouni Malinen <jmalinen@atheros.com> |
| 1090 | M: Sujith Manoharan <Sujith.Manoharan@atheros.com> | ||
| 1091 | M: Vasanthakumar Thiagarajan <vasanth@atheros.com> | 1090 | M: Vasanthakumar Thiagarajan <vasanth@atheros.com> |
| 1092 | M: Senthil Balasubramanian <senthilkumar@atheros.com> | 1091 | M: Senthil Balasubramanian <senthilkumar@atheros.com> |
| 1093 | L: linux-wireless@vger.kernel.org | 1092 | L: linux-wireless@vger.kernel.org |