diff options
| author | David S. Miller <davem@davemloft.net> | 2015-06-04 08:44:57 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-06-04 08:44:57 +0200 |
| commit | 9d1dabfbd0760269475a0cbbcc568505aa3ada60 (patch) | |
| tree | 213ac17d317dc4039e3aa38cab06852b6d6dfa9e /MAINTAINERS | |
| parent | Merge branch 'cxgb4-next' (diff) | |
| parent | Merge tag 'iwlwifi-next-for-kalle-2015-06-03' of https://git.kernel.org/pub/s... (diff) | |
| download | linux-9d1dabfbd0760269475a0cbbcc568505aa3ada60.tar.xz linux-9d1dabfbd0760269475a0cbbcc568505aa3ada60.zip | |
Merge tag 'wireless-drivers-next-for-davem-2015-06-03' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next
Kalle Valo says:
====================
new driver mt7601u for MediaTek Wi-Fi devices MT7601U
ath10k:
* qca6174 power consumption improvements, enable ASPM etc (Michal)
wil6210:
* support Wi-Fi Simple Configuration in STA mode
iwlwifi:
* a few fixes (re-enablement of interrupts for certain new
platforms that have special power states)
* Rework completely the RBD allocation model towards new
multi RX hardware.
* cleanups
* scan reworks continuation (Luca)
mwifiex:
* improve firmware debug functionality
rtlwifi:
* update regulatory database
brcmfmac:
* cleanup and new feature support in PCIe code
* alternative nvram loading for router support
====================
Conflicts:
drivers/net/wireless/iwlwifi/Kconfig
Trivial conflict in iwlwifi Kconfig, two commits adding
the same two chip numbers to the help text, but order
transposed.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index a798534a2ab1..3a4b7cbbaa72 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6372,6 +6372,12 @@ F: include/uapi/linux/meye.h F: include/uapi/linux/ivtv* F: include/uapi/linux/uvcvideo.h +MEDIATEK MT7601U WIRELESS LAN DRIVER +M: Jakub Kicinski <kubakici@wp.pl> +L: linux-wireless@vger.kernel.org +S: Maintained +F: drivers/net/wireless/mediatek/mt7601u/ + MEGARAID SCSI/SAS DRIVERS M: Kashyap Desai <kashyap.desai@avagotech.com> M: Sumit Saxena <sumit.saxena@avagotech.com> |