]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit49b265b5ec51e77ae17c5352746bd5c261c2a659
tree981a01386be5098aac692b96c203b5245cad8c2a
parentacd43722c46097b90d8b58e57e24e3806c13d1d4
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