1. 26 Apr, 2018 1 commit
    • Kalle Valo's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git · 0ddcf3e7
      Kalle Valo authored
      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:
      
        77e30e10 ("iwlwifi: mvm: query regdb for wmm rule if needed")
      
      from the wireless-drivers tree and commits:
      
        9c4f7d51 ("iwlwifi: move all NVM parsing code to the common files")
        4c625c56 ("iwlwifi: get rid of fw/nvm.c")
      
      from the wireless-drivers-next tree.
      0ddcf3e7
  2. 25 Apr, 2018 8 commits
  3. 24 Apr, 2018 31 commits