Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 21 Nov 2012 19:43:51 +0000 (14:43 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 21 Nov 2012 19:43:51 +0000 (14:43 -0500)
12 files changed:
1  2 
drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
drivers/net/wireless/brcm80211/brcmsmac/main.c
drivers/net/wireless/iwlwifi/dvm/mac80211.c
drivers/net/wireless/iwlwifi/dvm/rx.c
drivers/net/wireless/rtlwifi/rtl8192ce/trx.c
drivers/net/wireless/rtlwifi/rtl8192de/trx.c
drivers/net/wireless/rtlwifi/rtl8192se/trx.c
net/mac80211/cfg.c
net/mac80211/ibss.c
net/mac80211/ieee80211_i.h
net/mac80211/sta_info.c
net/mac80211/util.c

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