diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-03-29 16:41:36 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-03-29 16:41:36 -0400 |
| commit | 9a574cd67a447059f9c14bbef47873315d7f7b35 (patch) | |
| tree | 0ebb71d213d868d8884b1fa0e05b7393c66c665b /MAINTAINERS | |
| parent | 689b66cb53fbb5d567aa4e095eaa828aff73aef0 (diff) | |
| parent | 2e1253d640eb7f8707d2591c93097c1e9f9c71d5 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts:
net/mac80211/sta_info.c
net/wireless/core.h
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 143507e7f6df..685949bb8838 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -5043,9 +5043,8 @@ S: Maintained | |||
| 5043 | F: drivers/net/ethernet/marvell/sk* | 5043 | F: drivers/net/ethernet/marvell/sk* |
| 5044 | 5044 | ||
| 5045 | MARVELL LIBERTAS WIRELESS DRIVER | 5045 | MARVELL LIBERTAS WIRELESS DRIVER |
| 5046 | M: Dan Williams <dcbw@redhat.com> | ||
| 5047 | L: libertas-dev@lists.infradead.org | 5046 | L: libertas-dev@lists.infradead.org |
| 5048 | S: Maintained | 5047 | S: Orphan |
| 5049 | F: drivers/net/wireless/libertas/ | 5048 | F: drivers/net/wireless/libertas/ |
| 5050 | 5049 | ||
| 5051 | MARVELL MV643XX ETHERNET DRIVER | 5050 | MARVELL MV643XX ETHERNET DRIVER |