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)
commit4f81d715b90b7ebe049dd906511c47956086ad44
tree80810bd165359e940a30ac4852f95a628bbb1610
parent70eba4226d9718946941c7be0c8cb66d431e7686
parentccd384b10420ac81ba3fb9b0a7d18272c7173552
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless into for-davem
drivers/net/wireless/b43/dma.c
drivers/net/wireless/iwlegacy/4965-mac.c
drivers/net/wireless/mwifiex/cfg80211.c