diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-05-05 16:14:16 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-05-05 16:14:16 -0400 |
| commit | 83163244f845c296a118ce85c653872dbff6abfe (patch) | |
| tree | ce2eac695a1c198f23d537e20ed86c16ece21f7e /MAINTAINERS | |
| parent | 0a12761bcd5646691c5d16dd93df84d1b8849285 (diff) | |
| parent | adfba3c7c026a6a5560d2a43fefc9b198cb74462 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Conflicts:
drivers/net/wireless/libertas_tf/cmd.c
drivers/net/wireless/libertas_tf/main.c
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 405aea02dfbf..a73b9b3cffad 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -3956,6 +3956,7 @@ F: net/rfkill/ | |||
| 3956 | F: net/wireless/ | 3956 | F: net/wireless/ |
| 3957 | F: include/net/ieee80211* | 3957 | F: include/net/ieee80211* |
| 3958 | F: include/linux/wireless.h | 3958 | F: include/linux/wireless.h |
| 3959 | F: include/linux/iw_handler.h | ||
| 3959 | F: drivers/net/wireless/ | 3960 | F: drivers/net/wireless/ |
| 3960 | 3961 | ||
| 3961 | NETWORKING DRIVERS | 3962 | NETWORKING DRIVERS |