linux_dsm_epyc7002/drivers/net/wireless/ath
David S. Miller 1e8d6421cf Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/bonding/bond_3ad.h
	drivers/net/bonding/bond_main.c

Two minor conflicts in bonding, both of which were overlapping
changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-02-19 01:24:22 -05:00
..
ar5523 ar5523: fix usb id for Gigaset. 2014-02-04 15:30:07 -05:00
ath5k ath5k: shifting the wrong variable for AR5K_AR5210 2014-02-13 14:58:12 -05:00
ath6kl Merge remote-tracking branch 'wireless-next/master' into mac80211-next 2013-12-16 11:23:45 +01:00
ath9k ath9k: Fix TX power calculation 2014-02-04 15:30:07 -05:00
ath10k Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next 2014-01-13 14:40:59 -05:00
carl9170 carl9170: use ath_is_mybeacon 2014-01-16 14:55:45 -05:00
wcn36xx net: wirelesse: wcn36xx: pull allocation outside of critical section 2013-12-18 15:18:19 -05:00
wil6210 wil6210: Use pci_enable_msi_range() instead of pci_enable_msi_block() 2014-02-18 15:33:34 -05:00
ath.h ath: add common function ath_is_mybeacon 2014-01-16 14:55:44 -05: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 ath: add common function ath_is_mybeacon 2014-01-16 14:55:44 -05:00
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 cfg80211: make regulatory_hint() remove REGULATORY_CUSTOM_REG 2014-01-13 14:46:58 -05:00
regd.h