| commit | b18bf9733c4ca4db6fdb692895fabc9d934b7303 | [log] [tgz] |
|---|---|---|
| author | Johannes Berg <johannes.berg@intel.com> | Fri Feb 15 23:39:17 2013 +0100 |
| committer | Johannes Berg <johannes.berg@intel.com> | Mon Feb 18 20:16:26 2013 +0100 |
| tree | 981a01386be5098aac692b96c203b5245cad8c2a | |
| parent | e9b89fcc1f42fa6d19ecaae8cd8d86e49fa4cd38 [diff] |
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>