Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 9 Nov 2011 19:49:23 +0000 (14:49 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 9 Nov 2011 19:49:23 +0000 (14:49 -0500)
commit5e819059a20b0fc5a71875f28b4cae359e38d85a
treeb94a18142abc5e60c84f90ee2490e8a6af01c2a9
parentae2772b313b98a14f69b5bc67135c9fee48771be
parentcc438fccd5783c9f7b4c4858358ac897dcf8a58d
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless
drivers/net/wireless/ath/ath9k/hw.c
drivers/net/wireless/brcm80211/brcmsmac/dma.c
include/net/mac80211.h
net/mac80211/cfg.c
net/mac80211/ieee80211_i.h
net/mac80211/work.c
net/wireless/nl80211.c