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

From: Stephen Rothwell
Date: Fri Apr 08 2011 - 00:10:54 EST

Hi John,

Today's linux-next merge of the wireless tree got a conflict in
drivers/net/wireless/ath/ar9170/main.c and
drivers/net/wireless/ath/ar9170/phy.c between commit 25985edcedea ("Fix
common misspellings") from Linus' tree and commit b0006e696158
("ar9170usb: purge obsolete driver") from the wireless tree.

The latter just removed the files, so I did that.
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature