linux-next: manual merge of the net-next tree with the tree
From: Stephen Rothwell <hidden>
Date: 2011-12-05 01:34:49
Also in:
linux-next, lkml
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@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/ Attachments
- (unnamed) [application/pgp-signature] 836 bytes