From c6a21ff319947983446e99f90191401241ce9945 Mon Sep 17 00:00:00 2001
From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Date: Sun, 6 Jul 2014 12:51:22 +0300
Subject: [PATCH] iwlwifi: mvm: fix merge damage

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
---
Reading git-format-patch failed