diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-26 02:26:21 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-26 02:26:21 -0500 |
| commit | 19bc291c99f018bd4f2c38bbf69144086dca903f (patch) | |
| tree | 9d3cf9bc0c5a78e363dc0547da8bcd1e7c394265 /MAINTAINERS | |
| parent | 04488734806948624dabc4514f96f14cd75b9a50 (diff) | |
| parent | 4a6967b88af02eebeedfbb91bc09160750225bb5 (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-- | MAINTAINERS | 2 |
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 | |||
| 5978 | F: drivers/input/misc/wistron_btns.c | 5978 | F: drivers/input/misc/wistron_btns.c |
| 5979 | 5979 | ||
| 5980 | WL1251 WIRELESS DRIVER | 5980 | WL1251 WIRELESS DRIVER |
| 5981 | M: Kalle Valo <kalle.valo@nokia.com> | 5981 | M: Kalle Valo <kalle.valo@iki.fi> |
| 5982 | L: linux-wireless@vger.kernel.org | 5982 | L: linux-wireless@vger.kernel.org |
| 5983 | W: http://wireless.kernel.org | 5983 | W: http://wireless.kernel.org |
| 5984 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git | 5984 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git |