Merge tag 'iwlwifi-next-for-kalle-2015-05-03' of https://git.kernel.org/pub/scm/linux...
authorKalle Valo <kvalo@codeaurora.org>
Sat, 9 May 2015 13:21:49 +0000 (16:21 +0300)
committerKalle Valo <kvalo@codeaurora.org>
Sat, 9 May 2015 13:21:49 +0000 (16:21 +0300)
* major rework of the scan code (Luca)
* some work on the thermal code (Chaya Rachel)
* some work on the firwmare debugging infrastructure


Trivial merge