Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 30 Jan 2013 19:22:19 +0000 (14:22 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 30 Jan 2013 19:22:19 +0000 (14:22 -0500)
1  2 
drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
drivers/net/wireless/iwlwifi/dvm/mac80211.c
drivers/net/wireless/ti/wlcore/main.c
net/mac80211/ieee80211_i.h
net/mac80211/tx.c

Simple merge
Simple merge
Simple merge