linux_dsm_epyc7002/drivers/net/wireless/ath
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 ar5523: Add USB ID of D-Link WUA-2340 rev A1 2013-09-26 15:13:37 -04:00
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 tree-wide: use reinit_completion instead of INIT_COMPLETION 2013-11-15 09:32:21 +09:00
wcn36xx wcn36xx: enable the beaconing in mesh mode 2013-12-09 15:37:55 -05:00
wil6210 tree-wide: use reinit_completion instead of INIT_COMPLETION 2013-11-15 09:32:21 +09:00
ath.h ath9k: Cleanup WLAN/BT RX diversity 2013-08-05 14:52:42 -04:00
debug.c
dfs_pattern_detector.c ath9k/ath: move dfs pattern detector to ath 2013-10-18 14:03:54 -04:00
dfs_pattern_detector.h ath9k/ath: move dfs pattern detector to ath 2013-10-18 14:03:54 -04:00
dfs_pri_detector.c ath9k/ath: move dfs pattern detector to ath 2013-10-18 14:03:54 -04:00
dfs_pri_detector.h ath9k/ath: move dfs pattern detector to ath 2013-10-18 14:03:54 -04:00
hw.c ath: update hardware mac address with bssid mask 2013-04-22 15:20:15 -04:00
Kconfig ath: add support for proper dynamic regulatory hints 2013-10-18 14:04:41 -04:00
key.c ath: Let user know which keycache method is complaining. 2013-04-08 15:28:37 -04:00
main.c
Makefile ath9k/ath: move dfs pattern detector to ath 2013-10-18 14:03:54 -04:00
reg.h ath: update hardware mac address with bssid mask 2013-04-22 15:20:15 -04:00
regd_common.h
regd.c ath: fix dynamic user regulatory domain support 2013-12-05 15:45:51 -05:00
regd.h wireless: make the reg_notifier() void 2013-01-14 11:32:44 +01:00