David S. Miller 2be09de7d6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Lots of conflicts, by happily all cases of overlapping
changes, parallel adds, things of that nature.

Thanks to Stephen Rothwell, Saeed Mahameed, and others
for their guidance in these resolutions.

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

2018-12-20 11:53:36 -08:00

..

binding.c

iwlwifi: remove all occurrences of the FSF address paragraph

2018-08-31 11:38:33 +03:00

coex.c

iwlwifi: mvm: TLC support for Coex Schema 2

2018-09-28 08:57:27 +03:00

constants.h

iwlwifi: remove all occurrences of the FSF address paragraph

2018-08-31 11:38:33 +03:00

d3.c

iwlwifi: dbg: avoid passing trigger around

2018-11-11 11:06:19 +02:00

debugfs-vif.c

iwlwifi: mvm: remove unused conversion table

2018-11-11 11:06:21 +02:00

debugfs.c

iwlwifi: mvm: use match_string() helper

2018-10-06 10:25:54 +03:00

debugfs.h

iwlwifi: remove all occurrences of the FSF address paragraph

2018-08-31 11:38:33 +03:00

fw-api.h

iwlwifi: remove all occurrences of the FSF address paragraph

2018-08-31 11:38:33 +03:00

fw.c

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

2018-12-20 11:53:36 -08:00

led.c

iwlwifi: remove all occurrences of the FSF address paragraph

2018-08-31 11:38:33 +03:00

mac80211.c

Merge tag 'wireless-drivers-next-for-davem-2018-11-30' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next

2018-12-03 15:44:27 -08:00

mac-ctxt.c

iwlwifi: mvm: set MAC_FILTER_IN_11AX in AP mode

2018-11-23 13:01:07 +02:00

Makefile

iwlwifi: mvm: rs: add ops for the new rate scaling in the FW

2017-12-05 21:01:41 +02:00

mvm.h

iwlwifi: mvm: switch management tx antenna only on tx failure

2018-11-11 11:06:16 +02:00

nvm.c

iwlwifi: mvm: fix regulatory domain update when the firmware starts

2018-11-15 23:50:58 +02:00

offloading.c

iwlwifi: remove all occurrences of the FSF address paragraph

2018-08-31 11:38:33 +03:00

ops.c

Merge tag 'wireless-drivers-next-for-davem-2018-11-30' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next

2018-12-03 15:44:27 -08:00

phy-ctxt.c

iwlwifi: mvm: Move unused phy's to a default channel

2018-03-19 10:50:38 +02:00

power.c

iwlwifi: remove all occurrences of the FSF address paragraph

2018-08-31 11:38:33 +03:00

quota.c

iwlwifi: remove all occurrences of the FSF address paragraph

2018-08-31 11:38:33 +03:00

rs-fw.c

iwlwifi: fw: do not set sgi bits for HE connection

2018-11-11 11:06:17 +02:00

rs.c

iwlwifi: mvm: check return value of rs_rate_from_ucode_rate()

2018-10-13 14:48:44 +03:00

rs.h

iwlwifi: mvm: always init rs_fw with 20MHz bandwidth rates

2018-08-31 11:38:38 +03:00

rx.c

iwlwifi: dbg: group trigger condition to helper function

2018-10-06 10:25:44 +03:00

rxmq.c

iwlwifi: mvm: remove set but not used variable 'he_phy_data'

2018-11-11 11:06:13 +02:00

scan.c

iwlwifi: mvm: switch management tx antenna only on tx failure

2018-11-11 11:06:16 +02:00

sf.c

iwlwifi: remove all occurrences of the FSF address paragraph

2018-08-31 11:38:33 +03:00

sta.c

iwlwifi: mvm: toggle tx antenna if tx fails during connection establishment

2018-11-11 11:06:18 +02:00

sta.h

iwlwifi: mvm: toggle tx antenna if tx fails during connection establishment

2018-11-11 11:06:18 +02:00

tdls.c

iwlwifi: remove all occurrences of the FSF address paragraph

2018-08-31 11:38:33 +03:00

testmode.h

iwlwifi: remove all occurrences of the FSF address paragraph

2018-08-31 11:38:33 +03:00

time-event.c

iwlwifi: dbg: group trigger condition to helper function

2018-10-06 10:25:44 +03:00

time-event.h

iwlwifi: remove all occurrences of the FSF address paragraph

2018-08-31 11:38:33 +03:00

tof.c

iwlwifi: remove all occurrences of the FSF address paragraph

2018-08-31 11:38:33 +03:00

tof.h

iwlwifi: remove all occurrences of the FSF address paragraph

2018-08-31 11:38:33 +03:00

tt.c

iwlwifi: remove all occurrences of the FSF address paragraph

2018-08-31 11:38:33 +03:00

tx.c

iwlwifi: mvm: toggle tx antenna if tx fails during connection establishment

2018-11-11 11:06:18 +02:00

utils.c

iwlwifi: mvm: add description to a few generic assert numbers

2018-11-11 11:06:20 +02:00