Hi David,

Today's linux-next merge of the net tree got a conflict in
drivers/net/wireless/iwlwifi/iwl3945-base.c between commit
623d563e52d4d4041612e24b33a5610a900dd778 ("iwlwifi: fix error flow in
iwl*_pci_probe") from the wireless-current tree and various commit(s?)
from the net tree.

I used the version of the file from the merge-test branch of the wireless
tree (thanks, John).
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/