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

Stephen Rothwell reported quite a few conflicts in iwlwifi between
wireless-drivers and wireless-drivers-next. To avoid any problems later in
other trees merge w-d to w-d-next to fix those conflicts early.
This commit is contained in:
Kalle Valo 2017-08-24 14:29:12 +03:00
commit 5307eca136
15 changed files with 125 additions and 42 deletions