Merge branch 'iwlwifi-fixes' into iwlwifi-next
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Tue, 22 Jul 2014 16:26:41 +0000 (19:26 +0300)
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Tue, 22 Jul 2014 16:26:41 +0000 (19:26 +0300)
commit917d083d48f50537b21c8761e2366bf229ed9f5d
treef3021b3d4f3901e166e2bae61e41c73c88c7fd13
parent8a275bad9c0369aefebda90748f91361934dd638
parent4601879419f94a89fcbf427b4d3bfbf4ce294174
Merge branch 'iwlwifi-fixes' into iwlwifi-next

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Conflicts:
drivers/net/wireless/iwlwifi/mvm/mac80211.c
drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c
drivers/net/wireless/iwlwifi/mvm/mac80211.c