Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 25 Feb 2013 19:50:31 +0000 (14:50 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 25 Feb 2013 19:50:31 +0000 (14:50 -0500)
commit6d6436fbcbc43febe2481d3488f3bb5271ec2eb0
tree33d0526e5632b137a3d3d9134acb40cc06facaf6
parentea5cdccc46d392b73d941c723630d37094e8e8ea
parentdc4a787c8f52f9d6e46156953f8014a3353bcbc7
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless into for-davem
drivers/net/wireless/mwifiex/sdio.c