linux-next: manual merge of the wireless tree with Linus' tree

From: Stephen Rothwell
Date: Tue Apr 12 2011 - 22:30:33 EST

Hi John,

Today's linux-next merge of the wireless tree got a conflict in
drivers/net/wireless/iwlwifi/iwl-core.c between commit 25985edcedea ("Fix
common misspellings") from Linus' tree and commit ee3cd7e04ca0 ("iwlagn:
cleanup to remove the reference for 3945") from the wireless tree.

The latter removes the line that the former corrects, so I did that.
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature