leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
67ddc87f16
linux/drivers/net/wireless/ath
History
David S. Miller 67ddc87f16 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/wireless/ath/ath9k/recv.c
	drivers/net/wireless/mwifiex/pcie.c
	net/ipv6/sit.c

The SIT driver conflict consists of a bug fix being done by hand
in 'net' (missing u64_stats_init()) whilst in 'net-next' a helper
was created (netdev_alloc_pcpu_stats()) which takes care of this.

The two wireless conflicts were overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-03-05 20:32:02 -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 cfg80211: fix channel configuration in IBSS join 2014-02-04 21:58:16 +01:00
ath9k Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-03-05 20:32:02 -05:00
ath10k mac80211: move VHT related RX_FLAG to another variable 2014-02-06 09:34:10 +01:00
carl9170 carl9170: use ath_is_mybeacon 2014-01-16 14:55:45 -05:00
wcn36xx wcn36xx: Update dtim period before starting BSS 2014-02-13 15:20:18 -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 last_rssi to ath_common 2014-02-12 15:35:56 -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