| commit | 5307eca1362492ce28f1572b430997d9053c021d | [log] [tgz] |
|---|---|---|
| author | Kalle Valo <kvalo@codeaurora.org> | Thu Aug 24 14:29:12 2017 +0300 |
| committer | Kalle Valo <kvalo@codeaurora.org> | Thu Aug 24 14:47:42 2017 +0300 |
| tree | 83402432406875153d24aa6434437b6cbfccc2f8 | |
| parent | 2c1dca3c6b222a389c5dfebfcdd6fe3c87e5aa75 [diff] | |
| parent | e9bf53ab1ee34bb05c104bbfd2b77c844773f8e6 [diff] |
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.