| commit | 3cd32dde17ea938651b434fc35dee8370f555378 | [log] [tgz] |
|---|---|---|
| author | Kalle Valo <kvalo@qca.qualcomm.com> | Fri Sep 09 15:19:40 2016 +0300 |
| committer | Kalle Valo <kvalo@qca.qualcomm.com> | Fri Sep 09 15:19:40 2016 +0300 |
| tree | f55e2a98eb716ba1976aeb21d02ffbea3711fd26 | |
| parent | 78a9e170388b672f609cb6e8e097e0ddca24e6f5 [diff] | |
| parent | e34f2ff40e0339f6a379e1ecf49e8f2759056453 [diff] |
Merge branch 'ath-current' into ath-next
Commit 3c97f5de1f28 ("ath10k: implement NAPI support") conflicts with
ath-current. To avoid any merge problems merge ath-current to ath-next already now.
Conflicts:
drivers/net/wireless/ath/ath10k/htt_rx.c