Messages in this thread | | | Date | Wed, 11 Nov 2009 13:01:19 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the net/wireless trees with the wireless-current tree |
| |
Hi all,
Today's linux-next merge of the net tree got conflicts in drivers/net/wireless/iwlwifi/iwl-1000.c, drivers/net/wireless/iwlwifi/iwl-6000.c and drivers/net/wireless/iwlwifi/iwl-core.h between commits in the wireless-current tree and commits in the net (wireless) tree.
I used the versions from the net tree except where obvious additions had been made in the wireless-current tree. The fixes may not be correct - someone should merge the wireless-current tree into the net tree. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |