Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 31 Mar 2014 19:22:17 +0000 (15:22 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 31 Mar 2014 19:22:17 +0000 (15:22 -0400)
commit96da266e77637ae892b196f377908c51fa9f2d1a
treebf3da12850bbd46082add3060f9a5253aed144e0
parent9109e17f7c3ace48629397b44db5ce06bf168644
parenta31267c30880ebdc73e6815f58c69a665052fab8
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next into for-davem
drivers/net/wireless/mwifiex/main.c
drivers/net/wireless/mwifiex/scan.c