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/iwlwifi/iwl-core.h between commit
46e75f66677f5094bb51e91f9473128c4e907c7d ("net: fix for utsrelease.h
moving to generated") from Linus' tree and commit
61b91c1ea31d0d3ae5f848f7f7eab53dd691f8d0 ("iwlwifi: remove
linux/utsrelease.h dependency") from the wireless tree.

The latter clearly removes the need for the former, so I used that.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature