diff options
| author | David S. Miller <davem@davemloft.net> | 2009-06-20 01:16:40 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-06-20 01:16:40 -0700 |
| commit | c3da63f35773b04e885c5659e560d5c521d2682e (patch) | |
| tree | 5e876e7587f299cadce0b53bfaf912fb28d8283d /MAINTAINERS | |
| parent | 73e42897e8e5619eacb787d2ce69be12f47cfc21 (diff) | |
| parent | a97f4424fb4cddecf9b13c9b0e3f79924b624a7f (diff) | |
| download | linux-c3da63f35773b04e885c5659e560d5c521d2682e.tar.gz linux-c3da63f35773b04e885c5659e560d5c521d2682e.tar.bz2 linux-c3da63f35773b04e885c5659e560d5c521d2682e.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 7aa3081a8968..90a48e99e8b3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -940,7 +940,7 @@ M: me@bobcopeland.com L: linux-wireless@vger.kernel.org L: ath5k-devel@lists.ath5k.org S: Maintained -F: drivers/net/wireless/ath5k/ +F: drivers/net/wireless/ath/ath5k/ ATHEROS ATH9K WIRELESS DRIVER P: Luis R. Rodriguez @@ -956,7 +956,7 @@ M: senthilkumar@atheros.com L: linux-wireless@vger.kernel.org L: ath9k-devel@lists.ath9k.org S: Supported -F: drivers/net/wireless/ath9k/ +F: drivers/net/wireless/ath/ath9k/ ATHEROS AR9170 WIRELESS DRIVER P: Christian Lamparter @@ -964,7 +964,7 @@ M: chunkeey@web.de L: linux-wireless@vger.kernel.org W: http://wireless.kernel.org/en/users/Drivers/ar9170 S: Maintained -F: drivers/net/wireless/ar9170/ +F: drivers/net/wireless/ath/ar9170/ ATI_REMOTE2 DRIVER P: Ville Syrjala |