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

[Stephen Rothwell]

Hi John,

Today's linux-next merge of the wireless tree got a conflict in
drivers/net/wireless/rtlwifi/pci.c between commit 25985edcedea ("Fix
common misspellings") from Linus' tree and commit c7cfe38ee0f9 ("rtlwifi:
Convert pci routines for addition of rtl8192se and rtl8192de") from the
wireless tree.

The latter removes the line corrected by the former.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature