Commits
![Kalle Valo](https://secure.gravatar.com/avatar/a73fd6dd5ff3ccde9ef08cb8aaade6cc.jpg?s=96&d=mm)
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