linux-next: manual merge of the net-next tree with the wirelesstree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the net-next tree got a conflict in
drivers/net/wireless/ath/ath9k/main.c between commit bcb7ad7bcbef
("ath9k: Fix softlockup in AR9485") from the wireless tree and commit
ef1b6cd9a1ba ("ath9k: Group link monitoring logic") from the net-next
tree.

The latter removes the code modified by the former, so I did that.  The
fix from the former patch may be needed elsewhere now.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature