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

Three trivial overlapping conflicts.

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

2019-05-02 22:14:21 -04:00

..

binding.c

iwlwifi: remove all occurrences of the FSF address paragraph

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

coex.c

iwlwifi: mvm: simplify some return conditions

2019-02-04 12:27:18 +02:00

constants.h

iwlwifi: mvm: support non-transmitting AP

2019-02-20 20:47:57 +02:00

d3.c

iwlwifi: mvm: use dump worker during restart instead of sync dump

2019-03-22 12:59:41 +02:00

debugfs-vif.c

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

2019-05-02 22:14:21 -04:00

debugfs.c

iwlwifi: mvm: no need to check return value of debugfs_create functions

2019-04-03 11:20:03 +03:00

debugfs.h

iwlwifi: remove all occurrences of the FSF address paragraph

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

ftm-initiator.c

iwlwifi: fix 64-bit division

2019-03-07 19:15:06 +02:00

ftm-responder.c

iwlwifi: mvm: support FTM responder

2019-02-14 11:29:43 +02:00

fw-api.h

iwlwifi: mvm: add location APIs

2019-01-29 16:10:31 +02:00

fw.c

iwlwifi: mvm: don't attempt debug collection in rfkill

2019-04-18 14:07:39 +03:00

led.c

iwlwifi: mvm: add fall through comments where needed

2019-02-04 12:27:20 +02:00

mac80211.c

netlink: make validation more configurable for future strictness

2019-04-27 17:07:21 -04:00

mac-ctxt.c

iwlwifi: mvm: use correct GP2 register address for 22000 family

2019-04-03 11:20:04 +03:00

Makefile

iwlwifi: mvm: support FTM initiator

2019-02-14 11:29:43 +02:00

mvm.h

Merge tag 'wireless-drivers-next-for-davem-2019-04-18' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next

2019-04-18 11:07:55 -07:00

nvm.c

iwlwifi: mvm: save and export regdb blob from the NVM

2019-01-29 16:10:30 +02:00

offloading.c

iwlwifi: remove all occurrences of the FSF address paragraph

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

ops.c

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

2019-05-02 22:14:21 -04:00

phy-ctxt.c

iwlwifi: mvm: add fall through comments where needed

2019-02-04 12:27:20 +02:00

power.c

iwlwifi: mvm: add support for 32kHz external clock indication

2019-02-14 11:29:47 +02:00

quota.c

iwlwifi: remove all occurrences of the FSF address paragraph

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

rs-fw.c

iwlwifi: mvm: set max amsdu for TLC offload

2019-03-22 12:59:41 +02:00

rs.c

iwlwifi: mvm: no need to check return value of debugfs_create functions

2019-04-03 11:20:03 +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: mvm: add fall through comments where needed

2019-02-04 12:27:20 +02:00

rxmq.c

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

2019-05-02 22:14:21 -04:00

scan.c

iwlwifi: mvm: be more forgiving if num of channels is too big

2019-03-22 12:59:40 +02:00

sf.c

iwlwifi: mvm: make num_active_macs unsigned

2019-01-25 20:57:21 +02:00

sta.c

Merge tag 'wireless-drivers-next-for-davem-2019-04-18' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next

2019-04-18 11:07:55 -07:00

sta.h

iwlwifi: mvm: fix TX crypto on 22560+ devices

2019-03-22 12:49:03 +02:00

tdls.c

iwlwifi: mvm: use correct GP2 register address for 22000 family

2019-04-03 11:20:04 +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: mvm: disconnect in case of bad channel switch parameters

2019-03-22 12:59:40 +02:00

time-event.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: add some debug data to TX path

2019-02-20 20:47:59 +02:00

utils.c

iwlwifi: mvm: use correct GP2 register address for 22000 family

2019-04-03 11:20:04 +03:00