David S. Miller 143c905494 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/intel/i40e/i40e_main.c drivers/net/macvtap.c Both minor merge hassles, simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2013-12-18 16:42:06 -05:00
..
ar5523
ath5k	ath5k: Reset Tx interrupt bits also on PISR	2013-12-11 10:56:22 -05:00
ath6kl	Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next	2013-12-02 14:25:38 -05:00
ath9k	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-12-18 16:42:06 -05:00
ath10k	Merge tag 'for-linville-20131203' of git://github.com/kvalo/ath	2013-12-09 15:30:27 -05:00
carl9170
wcn36xx	wcn36xx: enable the beaconing in mesh mode	2013-12-09 15:37:55 -05:00
wil6210
ath.h
debug.c
dfs_pattern_detector.c
dfs_pattern_detector.h
dfs_pri_detector.c
dfs_pri_detector.h
hw.c
Kconfig
key.c
main.c
Makefile
reg.h
regd_common.h
regd.c	ath: fix dynamic user regulatory domain support	2013-12-05 15:45:51 -05:00
regd.h