Subject: linux-next: manual merge of the wireless-drivers-next tree with the wireless-drivers tree

From: Stephen Rothwell <[email-masked]>
Date: Fri, 16 Jan 2015 15:20:51 +1100

Hi Kalle,

Today's linux-next merge of the wireless-drivers-next tree got a
conflict in drivers/net/wireless/iwlwifi/mvm/scan.c between commit
1f9c418fd94c ("iwlwifi: mvm: fix EBS on single scan") from the
wireless-drivers tree and commit a1ed4025765c ("iwlwifi: mvm: Configure
EBS scan ratio") from the wireless-drivers-next tree.

I fixed it up (the latter moved the code modified by the former, but
also seems to have included the fix from the former patch) and can
carry the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    [email-masked]