Hi John,

Today's linux-next merge of the wireless tree got a conflict in
drivers/net/wireless/iwlwifi/iwl-pci.c between commit 16a9d06c753a
("iwlagn: sysfs couldn't find the priv pointer") from Linus' tree and
commit 65e291acd806 ("iwlagn: merge iwl_pci_down and iwl_pci_remove")
from the wireless tree.

I used the latter version as they ended up more or less thae same (with a
coupld of more changes in the latter).
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/