diff options
| author | Kalle Valo <kvalo@codeaurora.org> | 2018-04-26 13:26:37 +0300 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2018-04-26 13:26:37 +0300 |
| commit | 0ddcf3e76ae4d02918e609342a1020b50258fadd (patch) | |
| tree | 940b90c384895782eeb769e93a65ecf14ff474ae /drivers/net/wireless/intel/iwlwifi/iwl-csr.h | |
| parent | 51c12756de427ee0ff90e2f00e121d2f5311c140 (diff) | |
| parent | af8a41cccf8f469165c6debc8fe07c5fd2ca501a (diff) | |
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:
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/iwl-csr.h')
0 files changed, 0 insertions, 0 deletions