| commit | 81046f8ea423685cc8e5b33492c8ebfa214d3cbc | [log] [tgz] |
|---|---|---|
| author | Kalle Valo <kvalo@qca.qualcomm.com> | Wed Nov 23 21:43:30 2016 +0200 |
| committer | Kalle Valo <kvalo@qca.qualcomm.com> | Wed Nov 23 21:43:30 2016 +0200 |
| tree | 78854c84527ac557bd299ff7214c898fac1d113b | |
| parent | 964c1bd0ad32a521e4ee1ab57a9485c5a2a48079 [diff] | |
| parent | 705d7aa062203226c8df73f18622664e30bd8a61 [diff] |
Merge branch 'ath-next' Conflicts: drivers/net/wireless/ath/ath10k/mac.c