| commit | 0fac9e2dff00a2344ffc81d82749181ffae408a2 | [log] [tgz] |
|---|---|---|
| author | Kalle Valo <kvalo@codeaurora.org> | Mon Oct 16 17:06:54 2017 +0300 |
| committer | Kalle Valo <kvalo@codeaurora.org> | Mon Oct 16 17:09:24 2017 +0300 |
| tree | 1399ce5ce12955c971c4727dd70bc8b4db2754f1 | |
| parent | a39644b235c1a45f84d6e16603cacb93740ed2d4 [diff] | |
| parent | a6127b4440d1f74f26b64006b2f50c9dc6d66efc [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git Mark Brown reported that there are conflicts in iwlwifi between the two trees so fix those now.