Hi all, Today's linux-next merge of the net-next tree got a conflict in drivers/net/wireless/iwlwifi/iwl-agn.c between commits from the tree and commit 7335613ae27a ("iwlwifi: move all mac80211 related functions to one place") from the net-next tree. I just used the net-next version (which may require some fixes). -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/
Attachment:
pgpBf08fg3kEw.pgp
Description: PGP signature