linux-next: manual merge of the wireless tree

Hi John,

Today's linux-next merge of the wireless tree got a conflict in
drivers/net/wireless/iwlwifi/iwl-4965.c between commit
ec04fd60fd74a9db9c63fe11d519be3642cabfdd ("iwlwifi: fix incorrect 5GHz
rates reported in monitor mode") from the wireles-current tree (or maybe
the merge fixup with the net tree) and commit
1781a07fbe9cce3dc1697288a5edd260ea7edc02 ("iwlwifi: move RX handlers to
iwl-rx.c") from the wireless tree.

I took the version from the wireless tree (which matched the version in
you test merge, thanks).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/