diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-09-24 15:52:34 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-09-24 15:52:34 -0400 |
| commit | 29ad2facd47f8e37eab8b156e2c384fa181c8b4a (patch) | |
| tree | 25d4df186cd631810ff15a8e7d37cb6cdd806cdb /MAINTAINERS | |
| parent | 6e5c2b4e8addfaab8ef54dedaf7b607e1585c35b (diff) | |
| parent | cd87a2d3a33d75a646f1aa1aa2ee5bf712d6f963 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Conflicts:
drivers/net/wireless/ath/ath5k/base.c
net/mac80211/main.c
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index e9aec08e575a..6cb1c759eeaa 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -4555,7 +4555,7 @@ F: include/linux/preempt.h | |||
| 4555 | PRISM54 WIRELESS DRIVER | 4555 | PRISM54 WIRELESS DRIVER |
| 4556 | M: "Luis R. Rodriguez" <mcgrof@gmail.com> | 4556 | M: "Luis R. Rodriguez" <mcgrof@gmail.com> |
| 4557 | L: linux-wireless@vger.kernel.org | 4557 | L: linux-wireless@vger.kernel.org |
| 4558 | W: http://prism54.org | 4558 | W: http://wireless.kernel.org/en/users/Drivers/p54 |
| 4559 | S: Obsolete | 4559 | S: Obsolete |
| 4560 | F: drivers/net/wireless/prism54/ | 4560 | F: drivers/net/wireless/prism54/ |
| 4561 | 4561 | ||