John W. Linville e08fd975bf Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless ... Conflicts: drivers/net/wireless/brcm80211/Kconfig net/mac80211/util.c		2013-12-06 09:50:45 -05:00
..
brcmfmac	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless	2013-12-06 09:50:45 -05:00
brcmsmac	brcm80211: fix usage of freq_reg_info()	2013-12-05 14:54:49 -05:00
brcmutil	brcmutil: simplify brcmu_pkt_free_skb()	2013-04-22 15:20:21 -04:00
include	Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next	2013-10-07 15:40:44 -04:00
Kconfig	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless	2013-12-06 09:50:45 -05:00
Makefile