David S. Miller 0ddead90b2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

The conflicts were two cases of overlapping changes in
batman-adv and the qed driver.

Signed-off-by: David S. Miller <davem@davemloft.net>

2017-06-15 11:59:32 -04:00

..

ar5523

wireless: Set NL80211_EXT_FEATURE_CQM_RSSI_LIST in multiple drivers

2017-03-06 09:21:39 +01:00

ath5k

Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git

2017-05-19 11:47:44 +03:00

ath6kl

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2017-06-15 11:59:32 -04:00

ath9k

Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git

2017-05-19 11:47:44 +03:00

ath10k

Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git

2017-05-19 11:47:44 +03:00

carl9170

mac80211: separate encoding/bandwidth from flags

2017-04-28 10:41:45 +02:00

wcn36xx

wcn36xx: Close SMD channel on device removal

2017-05-23 18:23:00 +03:00

wil6210

wil6210: use memdup_user

2017-05-19 10:53:06 +03:00

ath.h

ath9k: add a helper to get the string representation of ath_bus_type

2016-11-15 16:55:37 +02:00

debug.c

ath: Make ath_opmode_to_string understand OCB mode

2015-08-10 22:21:15 +03:00

dfs_pattern_detector.c

ath: constify local structures

2016-09-14 20:01:39 +03:00

dfs_pattern_detector.h

ath: use PRI value given by spec for fixed PRI

2015-09-27 15:50:30 +03:00

dfs_pri_detector.c

ath: use PRI value given by spec for fixed PRI

2015-09-27 15:50:30 +03: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: unify Kconfig with other vendors

2015-11-18 14:28:31 +02:00

key.c

ath: Let user know which keycache method is complaining.

2013-04-08 15:28:37 -04:00

main.c

ath9k: add a helper to get the string representation of ath_bus_type

2016-11-15 16:55:37 +02:00

Makefile

Makefile: drop -D__CHECK_ENDIAN__ from cflags

2016-12-16 00:13:43 +02:00

reg.h

ath: update hardware mac address with bssid mask

2013-04-22 15:20:15 -04:00

regd_common.h

ath: fix spelling of Grenada

2011-08-08 16:04:13 -04:00

regd.c

ath: Fix updating radar flags for coutry code India

2017-04-19 17:09:26 +03:00

regd.h

ath: export alpha2 helper

2016-10-04 18:01:48 +03:00

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