diff options
author | David S. Miller <davem@davemloft.net> | 2010-08-06 22:30:43 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-08-06 22:30:43 +0200 |
commit | e225567960db50e9810a152c8621c7a6ed94de71 (patch) | |
tree | d0129e2988f8aea56d4f00f04c4818c2e8cc07a2 /MAINTAINERS | |
parent | isdn: fix information leak (diff) | |
parent | iwlwifi: fix locking assertions (diff) | |
download | linux-e225567960db50e9810a152c8621c7a6ed94de71.tar.xz linux-e225567960db50e9810a152c8621c7a6ed94de71.zip |
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/ ATHEROS ATH9K WIRELESS DRIVER M: "Luis R. Rodriguez" <lrodriguez@atheros.com> M: Jouni Malinen <jmalinen@atheros.com> -M: Sujith Manoharan <Sujith.Manoharan@atheros.com> M: Vasanthakumar Thiagarajan <vasanth@atheros.com> M: Senthil Balasubramanian <senthilkumar@atheros.com> L: linux-wireless@vger.kernel.org |