Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 10 May 2013 14:29:24 +0000 (10:29 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 10 May 2013 14:29:24 +0000 (10:29 -0400)
1  2 
drivers/net/wireless/b43/dma.c
drivers/net/wireless/iwlegacy/4965-mac.c
drivers/net/wireless/mwifiex/cfg80211.c

Simple merge