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@xxxxxxxxxxxxxxxx
Attachment:
pgpn6x1NmB0jo.pgp
Description: PGP signature
