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)
commit75c8ec71fb29ed59c4b9bda2f411ed3b09164cf7
treec1dfd91e624b48ccefa71db573d043b639fe088f
parent1e60896fe07307baa5f3ca1a220dfa9792657352
parent77d2ece6fde80631193054edc9c9a3edad519565
Merge branch 'for-john' of git://git./linux/kernel/git/jberg/mac80211-next
12 files changed:
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