David S. Miller 1f6d80358d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: arch/mips/net/bpf_jit.c drivers/net/can/flexcan.c Both the flexcan and MIPS bpf_jit conflicts were cases of simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-09-23 12:09:27 -04:00
..
ar5523	mac80211: add vif to flush call	2014-04-09 10:55:29 +02:00
ath5k	ath5k: Add missing vmalloc.h include.	2014-09-09 16:37:11 -07:00
ath6kl	Not that much content this time. Some RCU cleanups, crypto	2014-09-04 13:41:33 -04:00
ath9k	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-09-23 12:09:27 -04:00
ath10k	Merge branch 'for-linville' of git://github.com/kvalo/ath	2014-08-28 14:36:38 -04:00
carl9170	carl9170: tx: Replace rcu_assign_pointer() with RCU_INIT_POINTER()	2014-08-28 14:50:13 -04:00
wcn36xx	wcn36xx: remove unnecessary break after goto	2014-07-13 23:45:24 -07:00
wil6210	Not that much content this time. Some RCU cleanups, crypto	2014-09-04 13:41:33 -04:00
ath.h	ath9k: Add a debug level for channel context	2014-08-28 14:41:57 -04:00
debug.c
dfs_pattern_detector.c	ath: add JP DFS pattern detector	2014-05-16 14:26:53 -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
Kconfig	ath: add support for proper dynamic regulatory hints	2013-10-18 14:04:41 -04:00
key.c
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
regd_common.h
regd.c	ath: remove camel case from struct reg_dmn_pair_mapping	2014-02-14 13:20:32 +02:00
regd.h
spectral_common.h	ath10k: add spectral scan feature	2014-08-04 09:07:54 +03:00