drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c · 8a185006bce519738fe06350aa8d5195e9a1da62 · Kirill Smelkov / linux

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

Kalle Valo authored Jul 10, 2016

This is to fix some conflicts in iwlwifi.

Conflicts:
	drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
	drivers/net/wireless/intel/iwlwifi/mvm/scan.c

8a185006

rxmq.c 29.8 KB

Replace rxmq.c