diff options
| author |   David S. Miller <davem@davemloft.net> | 2015-07-31 15:33:23 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-07-31 15:33:23 -0700 |
| commit | b7a0925e47031d51041ce9a357edc02fb67d0b1d (patch) | |
| tree | bbcc17c342663a7265ab7e0daa809bf75012854e /MAINTAINERS | |
| parent | sfc: MC allocations must be restored following an entity reset (diff) | |
| parent | Revert "ath9k: export HW random number generator" (diff) | |
| download | linux-dev-b7a0925e47031d51041ce9a357edc02fb67d0b1d.tar.xz linux-dev-b7a0925e47031d51041ce9a357edc02fb67d0b1d.zip | |
Merge tag 'wireless-drivers-next-for-davem-2015-07-31' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next
Kalle Valo says:
====================
Major changes:
mwifiex:
* add TX DATA Pause support
* add multichannel and TDLS channel switch support
ath10k:
* enable VHT for IBSS
* initial work to support qca99x0 and the corresponding 10.4 firmware branch
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 6712fd5f4200..5f5c897820f6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6507,7 +6507,7 @@ F: drivers/net/ethernet/marvell/mvneta.* MARVELL MWIFIEX WIRELESS DRIVER M: Amitkumar Karwar <akarwar@marvell.com> -M: Avinash Patil <patila@marvell.com> +M: Nishant Sarmukadam <nishants@marvell.com> L: linux-wireless@vger.kernel.org S: Maintained F: drivers/net/wireless/mwifiex/ |