]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'ath-current' into ath-next
authorKalle Valo <kvalo@qca.qualcomm.com>
Fri, 9 Sep 2016 12:19:40 +0000 (15:19 +0300)
committerKalle Valo <kvalo@qca.qualcomm.com>
Fri, 9 Sep 2016 12:19:40 +0000 (15:19 +0300)
commit3e6dbc4e64d07e0e2e51d183614160c50212f7b2
treef55e2a98eb716ba1976aeb21d02ffbea3711fd26
parentdc72ac19de50af13a84824e54f8a74dc93623c60
parent0d69695a4ae904ce9402f45b02a4bf49c170910d
Merge branch 'ath-current' into ath-next

Commit 964cb579faca ("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
drivers/net/wireless/ath/ath10k/htt_rx.c
drivers/net/wireless/ath/ath10k/pci.c
drivers/net/wireless/ath/ath9k/main.c