linux-next: manual merge of the wireless tree with thewireless-current tree

[Stephen Rothwell]

Hi John,

Today's linux-next merge of the wireless tree got a conflict in
drivers/net/wireless/ath/ath9k/main.c between commit
54ab040d24904d1fa2c0a6a27936b7c56a4efb24 ("ath9k: set ps_default as
false") from the wireless-current tree and commit
18b6c9a2213d3b6e0212e8b225abf95f7564206a ("ath9k: set ps_default as
false") from the wireless tree.

The commit message of the latter made me use just its version.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature