pull request: iwlwifi 2014-07-21

[Emmanuel Grumbach <egrumbach@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 1166 bytes --]

Hi John,

This is a pull request for 3.16.

It includes a merge damage fix. This region has been changed in -next and -fixes quite a few times and apparently, I failed to handle it properly, so here the fix.
Along with that I have a fix from Eliad to properly handle overlapping BSS in AP mode.

Let me know if you have issues with this.
Thanks!

The following changes since commit dc271ee0d04d12d6bfabacbec803289a7072fbd9:

  iwlwifi: mvm: disable CTS to Self (2014-07-03 20:55:18 +0300)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes.git master

for you to fetch changes up to 4601879419f94a89fcbf427b4d3bfbf4ce294174:

  iwlwifi: mvm: pass beacons from foreign APs (2014-07-21 10:38:25 +0300)

----------------------------------------------------------------
Eliad Peller (1):
      iwlwifi: mvm: pass beacons from foreign APs

Emmanuel Grumbach (1):
      iwlwifi: mvm: fix merge damage

 drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c | 15 +++++++++++++--
 drivers/net/wireless/iwlwifi/mvm/mac80211.c |  7 -------
 2 files changed, 13 insertions(+), 9 deletions(-)


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 901 bytes --]