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)
commit20fb9e50338199d9e88512703af4c560ab53bad4
tree2d0913749141e9e8e0df774426a658b52fddabbf
parent0f496df2d9ba48faa808b5fa330de0da1a2d29d7
parent3b4797bce0050570e84bedd10e1b14e9320a3551
Merge branch 'for-john' of git://git./linux/kernel/git/jberg/mac80211-next
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