iwlwifi: mvm: fix merge damage
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Sun, 6 Jul 2014 09:51:22 +0000 (12:51 +0300)
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Sun, 6 Jul 2014 09:51:22 +0000 (12:51 +0300)
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
drivers/net/wireless/iwlwifi/mvm/mac80211.c