Kalle Valo 0fac9e2dff Merge git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git ...

Mark Brown reported that there are conflicts in iwlwifi between the two trees
so fix those now.

2017-10-16 17:09:24 +03:00

..

binding.c

iwlwifi: mvm: memset binding before setting values

2017-04-25 23:06:51 +03:00

coex.c

iwlwifi: mvm: support new Coex firmware API

2017-08-18 16:03:40 +03:00

constants.h

iwlwifi: mvm: change open and close criteria of a BA session

2017-08-18 17:24:04 +03:00

d3.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git

2017-10-16 17:09:24 +03:00

debugfs-vif.c

iwlwifi: mvm: remove support for Link Quality Measurements

2017-10-06 14:57:21 +03:00

debugfs.c

iwlwifi: mvm: add dbgfs entry for fw info

2017-10-06 14:57:20 +03:00

debugfs.h

…

fw-api.h

iwlwifi: mvm: use firmware LED command where applicable

2017-08-09 09:15:32 +03:00

fw.c

iwlwifi: acpi: move function to get mcc into acpi code

2017-10-06 15:22:32 +03:00

led.c

iwlwifi: mvm: only send LEDS_CMD when the FW supports it

2017-09-07 19:40:09 +03:00

mac80211.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git

2017-10-16 17:09:24 +03:00

mac-ctxt.c

iwlwifi: mvm: support new beacon template command

2017-08-09 21:14:41 +03:00

Makefile

iwlwifi: refactor firmware debug code

2017-08-01 12:41:43 +03:00

mvm.h

Merge git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git

2017-10-16 17:09:24 +03:00

nvm.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git

2017-10-16 17:09:24 +03:00

offloading.c

…

ops.c

iwlwifi: remove dflt_pwr_limit from the transport

2017-10-06 15:22:34 +03:00

phy-ctxt.c

iwlwifi: mvm: don't send identical PHY_CTXT_CMD

2017-10-06 14:57:22 +03:00

power.c

iwlwifi: reorganize firmware API

2017-08-01 12:41:43 +03:00

quota.c

iwlwifi: mvm: Add new quota command API

2017-10-06 14:57:21 +03:00

rs.c

iwlwifi: mvm: change state when queueing agg start work

2017-09-08 11:43:38 +03:00

rs.h

iwlwifi: mvm: support aggs of 64 frames in A000 family

2017-06-29 13:26:25 +03:00

rx.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git

2017-10-16 17:09:24 +03:00

rxmq.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git

2017-10-16 17:09:24 +03:00

scan.c

iwlwifi: mvm: set status before calling iwl_mvm_send_cmd_status()

2017-09-08 11:50:30 +03:00

sf.c

iwlwifi: mvm: prepare for station count change

2017-04-19 22:20:51 +03:00

sta.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git

2017-10-16 17:09:24 +03:00

sta.h

iwlwifi: mvm: change state when queueing agg start work

2017-09-08 11:43:38 +03:00

tdls.c

iwlwifi: mvm: use schedule_delayed_work()

2017-06-05 23:34:26 +03:00

testmode.h

…

time-event.c

iwlwifi: mvm: remove session protection to allow channel switch

2017-08-18 16:10:43 +03:00

time-event.h

iwlwifi: mvm: extend time event duration

2016-03-07 13:34:16 +02:00

tof.c

iwlwifi: reorganize firmware API

2017-08-01 12:41:43 +03:00

tof.h

iwlwifi: reorganize firmware API

2017-08-01 12:41:43 +03:00

tt.c

iwlwifi: mvm: return -ENODATA when reading the temperature with the FW down

2017-10-06 13:59:44 +03:00

tx.c

iwlwifi: mvm: send all non-bufferable frames on the probe queue

2017-09-08 11:34:51 +03:00

utils.c

iwlwifi: mvm: support firmware debug trigger on frame reorder timeout

2017-10-06 14:57:21 +03:00