David S. Miller 6026e043d0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Three cases of simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-09-01 17:42:05 -07:00
..
ctxt-info.c	iwlwifi: pcie: support short Tx queues for A000 device family	2017-08-18 16:04:44 +03:00
drv.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git	2017-08-24 14:47:42 +03:00
internal.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-09-01 17:42:05 -07:00
rx.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-09-01 17:42:05 -07:00
trans-gen2.c	iwlwifi: pcie: rename iwl_trans_check_hw_rf_kill() to pcie	2017-08-01 12:41:45 +03:00
trans.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-09-01 17:42:05 -07:00
tx-gen2.c	iwlwifi: pcie: support short Tx queues for A000 device family	2017-08-18 16:04:44 +03:00
tx.c	iwlwifi: pcie: support short Tx queues for A000 device family	2017-08-18 16:04:44 +03:00