Kalle Valo 0ddcf3e76a Merge git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git ... To fix a conflict reported by Stephen Rothwell <sfr@canb.auug.org.au>: Today's linux-next merge of the wireless-drivers-next tree got a conflict in: drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c between commit: 77e30e10ee ("iwlwifi: mvm: query regdb for wmm rule if needed") from the wireless-drivers tree and commits: 9c4f7d5127 ("iwlwifi: move all NVM parsing code to the common files") 4c625c564b ("iwlwifi: get rid of fw/nvm.c") from the wireless-drivers-next tree.		2018-04-26 13:26:37 +03:00
..
b43	b43: Replace mdelay with usleep_range in b43_radio_2057_init_post	2018-01-11 21:54:01 +02:00
b43legacy	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2017-11-04 09:26:51 +09:00
brcm80211	Merge git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git	2018-04-26 13:26:37 +03:00
Kconfig	net/wireless: fix spaces and grammar copy/paste in vendor Kconfig help text	2018-03-13 18:52:25 +02:00
Makefile	brcm80211: move under broadcom vendor directory	2015-11-18 11:24:22 +02:00