From: Kalle Valo
Date: Thu, 01 Dec 2016 20:33:37 +0200
> here's another pull request for net-next. Nothing special to mention
> about, the details are in the signed tag below.
>
> This time there's a trivial conflict in
> drivers/net/wireless/ath/ath10k/mac.c:
>
> <<< HEAD
> ieee80211
Hi Dave,
here's another pull request for net-next. Nothing special to mention
about, the details are in the signed tag below.
This time there's a trivial conflict in
drivers/net/wireless/ath/ath10k/mac.c:
<<< HEAD
ieee80211_hw_set(ar->hw, SUPPORTS_TX_FRAG);
===
ieee80211_
