aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-02-26 02:26:21 -0500
committerDavid S. Miller <davem@davemloft.net>2010-02-26 02:26:21 -0500
commit19bc291c99f018bd4f2c38bbf69144086dca903f (patch)
tree9d3cf9bc0c5a78e363dc0547da8bcd1e7c394265 /MAINTAINERS
parent04488734806948624dabc4514f96f14cd75b9a50 (diff)
parent4a6967b88af02eebeedfbb91bc09160750225bb5 (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Conflicts: drivers/net/wireless/iwlwifi/iwl-core.h drivers/net/wireless/rt2x00/rt2800pci.c
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS2
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 2a479c7005b8..6bd1cd5c60df 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5978,7 +5978,7 @@ S: Maintained
5978F: drivers/input/misc/wistron_btns.c 5978F: drivers/input/misc/wistron_btns.c
5979 5979
5980WL1251 WIRELESS DRIVER 5980WL1251 WIRELESS DRIVER
5981M: Kalle Valo <kalle.valo@nokia.com> 5981M: Kalle Valo <kalle.valo@iki.fi>
5982L: linux-wireless@vger.kernel.org 5982L: linux-wireless@vger.kernel.org
5983W: http://wireless.kernel.org 5983W: http://wireless.kernel.org
5984T: git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git 5984T: git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git