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 18d0077f0c4a ("iwlagn: remove drvdata support from bus layer")
from the wireless tree.
I fixed it up (I used the version from the wireless tree) and can carry
the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpMX7BKC85FJ.pgp
Description: PGP signature
