Merge git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git

The last pull request didn't make it to v4.15 (I was too late) so pull it to
wireless-drivers-next.git instead so that it can go to v4.16.