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
..
1000.c
2000.c
5000.c
6000.c
7000.c	iwlwifi: nvm: set the correct offsets to 3168 series	2017-10-06 13:59:44 +03:00
8000.c	iwlwifi: nvm: set the correct offsets to 3168 series	2017-10-06 13:59:44 +03:00
9000.c	iwlwifi: nvm: set the correct offsets to 3168 series	2017-10-06 13:59:44 +03:00
a000.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git	2017-10-16 17:09:24 +03:00