David S. Miller 60747ef4d1 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Minor overlapping changes for both merge conflicts.

Resolution work done by Stephen Rothwell was used
as a reference.

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

2016-08-18 01:17:32 -04:00

..

ar5523

net: wireless: ath: ar5523: ar5523: don't print error when allocating urb fails

2016-08-13 14:53:40 -07:00

ath5k

ath5k: fix misplaced default label in sifs switch

2016-06-14 15:18:09 +03:00

ath6kl

tree-wide: replace config_enabled() with IS_ENABLED()

2016-08-04 08:50:07 -04:00

ath9k

tree-wide: replace config_enabled() with IS_ENABLED()

2016-08-04 08:50:07 -04:00

ath10k

tree-wide: replace config_enabled() with IS_ENABLED()

2016-08-04 08:50:07 -04:00

carl9170

carl9170: Clarify kconfig text

2016-06-04 17:58:14 +03:00

wcn36xx

wcn36xx: Silence error about unsupported smd event 188

2016-07-08 17:04:40 +03:00

wil6210

nl80211: support beacon report scanning

2016-07-06 14:51:31 +02:00

ath.h

cfg80211: remove enum ieee80211_band

2016-04-12 15:56:15 +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

tree-wide: replace config_enabled() with IS_ENABLED()

2016-08-04 08:50:07 -04: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

…

hw.c

…

Kconfig

ath: unify Kconfig with other vendors

2015-11-18 14:28:31 +02: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

tree-wide: replace config_enabled() with IS_ENABLED()

2016-08-04 08:50:07 -04:00

regd.h

cfg80211: remove enum ieee80211_band

2016-04-12 15:56:15 +02: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