diff options
| author | Kalle Valo <[email protected]> | 2018-04-26 10:26:37 +0000 |
|---|---|---|
| committer | Kalle Valo <[email protected]> | 2018-04-26 10:26:37 +0000 |
| commit | 0ddcf3e76ae4d02918e609342a1020b50258fadd (patch) | |
| tree | 940b90c384895782eeb769e93a65ecf14ff474ae /drivers/net/wireless/intel/iwlwifi/mvm/utils.c | |
| parent | Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git (diff) | |
| parent | rtlwifi: cleanup 8723be ant_sel definition (diff) | |
| download | kernel-0ddcf3e76ae4d02918e609342a1020b50258fadd.tar.gz kernel-0ddcf3e76ae4d02918e609342a1020b50258fadd.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git
To fix a conflict reported by Stephen Rothwell <[email protected]>:
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:
77e30e10ee28 ("iwlwifi: mvm: query regdb for wmm rule if needed")
from the wireless-drivers tree and commits:
9c4f7d512740 ("iwlwifi: move all NVM parsing code to the common files")
4c625c564ba2 ("iwlwifi: get rid of fw/nvm.c")
from the wireless-drivers-next tree.
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/mvm/utils.c')
0 files changed, 0 insertions, 0 deletions