Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 24 Aug 2012 16:25:30 +0000 (12:25 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 24 Aug 2012 16:25:30 +0000 (12:25 -0400)
14 files changed:
1  2 
drivers/net/wireless/at76c50x-usb.c
drivers/net/wireless/ath/ath5k/mac80211-ops.c
drivers/net/wireless/ath/ath9k/main.c
drivers/net/wireless/b43/main.c
drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
drivers/net/wireless/rtl818x/rtl8187/dev.c
drivers/staging/winbond/wbusb.c
include/linux/bcma/bcma_driver_chipcommon.h
include/net/cfg80211.h
net/mac80211/mesh.c
net/mac80211/mlme.c
net/mac80211/scan.c
net/wireless/core.c
net/wireless/util.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge