Hi Dave,
Today's linux-next merge of the net tree got a conflict in
drivers/net/wireless/iwlwifi/iwl-agn.c between commit
c4e061ace75513aee227090486cc46dec7810c00 ("iwlwifi: save PCI state before
suspend, restore after resume") from the wireless-current tree and
commit 6cd0b1cb872b3bf9fc5de4536404206ab74bafdd ("iwlagn: fix hw-rfkill
while the interface is down") from the net and wireless trees.
The former just appears to be a subset of the latter. I fixed it up and
can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpiMsBPery7N.pgp
Description: PGP signature
