projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: e9b89fc) | patch
iwlwifi: mvm: fix merge error
authorJohannes Berg <johannes.berg@intel.com>
Fri, 15 Feb 2013 22:39:17 +0000 (23:39 +0100)
committerJohannes Berg <johannes.berg@intel.com>
Mon, 18 Feb 2013 19:16:26 +0000 (20:16 +0100)
commitb18bf9733c4ca4db6fdb692895fabc9d934b7303
tree981a01386be5098aac692b96c203b5245cad8c2atree | snapshot (tar.gz zip)
parente9b89fcc1f42fa6d19ecaae8cd8d86e49fa4cd38commit | 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>
drivers/net/wireless/iwlwifi/mvm/mac80211.c diff | blob | blame | history