tree 981a01386be5098aac692b96c203b5245cad8c2a
parent e9b89fcc1f42fa6d19ecaae8cd8d86e49fa4cd38
author Johannes Berg <johannes.berg@intel.com> 1360967957 +0100
committer Johannes Berg <johannes.berg@intel.com> 1361214986 +0100

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>