Hi Dave,
Today's linux-next merge of the net tree got a conflict in
drivers/net/wireless/iwlwifi/iwl3945-base.c between commit
c4e061ace75513aee227090486cc46dec7810c00 ("iwlwifi: save PCI state before
suspend, restore after resume") from the wireless-current tree and commit
2663516d8fb896430bf42dce41b3e2f141d63bd5 ("iwl3945: report killswitch
changes even if the interface is down") from the net and wireless trees.
Again, the former is just a subset of the latter.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpw9NNQ6TzFh.pgp
Description: PGP signature
