David S. Miller 95f873f2ff Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: arch/arm/boot/dts/imx6sx-sdb.dts net/sched/cls_bpf.c Two simple sets of overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-01-27 16:59:56 -08:00
..
ar5523	mac80211: add vif to flush call	2014-04-09 10:55:29 +02:00
ath5k	ath5k: document a fall-through case in ath5k_hw_set_opmode	2015-01-23 21:17:26 +02:00
ath6kl	cfg80211: change bandwidth reporting to explicit field	2015-01-15 22:41:32 +01:00
ath9k	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-01-27 16:59:56 -08:00
ath10k	Merge commit 'c1e140bf79d817d4a7aa9932eb98b0359c87af33' from mac80211-next	2015-01-22 14:49:44 +02:00
carl9170	cfg80211: remove "channel" from survey names	2015-01-08 15:27:52 +01:00
wcn36xx	wcn36xx: initiate TX BA sessions	2015-01-23 19:12:12 +02:00
wil6210	Merge commit 'c1e140bf79d817d4a7aa9932eb98b0359c87af33' from mac80211-next	2015-01-22 14:49:44 +02:00
ath.h	Merge commit '4e6ce4dc7ce71d0886908d55129d5d6482a27ff9' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless	2014-11-19 15:38:48 -05:00
debug.c
dfs_pattern_detector.c	ath: fix incorrect PPB on FCC radar type 5	2014-12-24 17:28:28 +02: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 tracing	2014-10-02 14:23:14 -04:00
key.c
main.c	ath: Fix smatch warning	2014-10-07 14:48:37 -04:00
Makefile	ath: Add support for tracing	2014-10-02 14:23:14 -04:00
reg.h
regd_common.h
regd.c	ath: use CTL region from cfg80211 if unset in EEPROM	2014-10-23 14:02:06 -04:00
regd.h
spectral_common.h	ath10k: add spectral scan feature	2014-08-04 09:07:54 +03:00
trace.c	ath: Add support for tracing	2014-10-02 14:23:14 -04:00
trace.h	ath: Add support for tracing	2014-10-02 14:23:14 -04:00