Stephen Rothwell wrote:
> Today's linux-next merge of the wireless-next tree got a conflict in
> drivers/net/wireless/ath/ath9k/Kconfig between commit 8bb7f167a12a
> ("ath9k: Use minstrel rate control by default") from the wireless tree
> and commit cf657a2bc50d ("ath9k: Remove MAC_DEBUG") from the
> wireless-next tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Thanks !
Sujith
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
