From: Johannes Berg <johannes.berg@intel.com>
Date: Fri, 15 Feb 2013 22:39:17 +0000 (+0100)
Subject: iwlwifi: mvm: fix merge error
X-Git-Tag: v3.9-rc1~139^2~2^2^2~16
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b18bf9733c4ca4db6fdb692895fabc9d934b7303;p=pandora-kernel.git

iwlwifi: mvm: fix merge error

The iwlwifi-next tree removed IEEE80211_HW_NEED_DTIM_BEFORE_ASSOC
while the mac80211-next tree removed

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---

Reading git-diff-tree failed