Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 15 Aug 2012 18:29:37 +0000 (14:29 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 15 Aug 2012 18:29:37 +0000 (14:29 -0400)
commit16698918cdb39ae0d9289741ac2a9ed179f8b8ba
tree0e4ef865526a8b5b27e939e6cb4b0d7f334e3cea
parent1f07b62f3205f6ed41759df2892eaf433bc051a1
parent22c5649eef0fc37532e20c14d2656b28ca708a69
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next into for-davem
drivers/bcma/host_pci.c
drivers/net/wireless/b43/main.c
drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
include/linux/bcma/bcma_driver_chipcommon.h
net/mac80211/mesh.c