diff --git a/[refs] b/[refs] index 35fe9baa1681..25adbc8c7687 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f850e00fcd7767d01101e2f0a6d464bee8e48b47 +refs/heads/master: fcad584d12831864727aef917190fc3e24cfe541 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index a301ffa78eab..877ab1b882e7 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -4066,6 +4066,12 @@ S: Maintained F: drivers/net/mv643xx_eth.* F: include/linux/mv643xx.h +MARVELL MWIFIEX WIRELESS DRIVER +M: Bing Zhao +L: linux-wireless@vger.kernel.org +S: Maintained +F: drivers/net/wireless/mwifiex/ + MARVELL MWL8K WIRELESS DRIVER M: Lennert Buytenhek L: linux-wireless@vger.kernel.org