Messages in this thread | | | Date | Thu, 14 Jun 2012 13:12:56 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the net-next tree with the wireless tree |
| |
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@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |