diff options
| author |   Johannes Berg <johannes.berg@intel.com> | 2013-02-15 23:39:17 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-02-18 20:16:26 +0100 |
| commit | b18bf9733c4ca4db6fdb692895fabc9d934b7303 (patch) | |
| tree | 981a01386be5098aac692b96c203b5245cad8c2a /tools/perf/scripts/python/export-to-postgresql.py | |
| parent | Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next (diff) | |
| download | linux-dev-b18bf9733c4ca4db6fdb692895fabc9d934b7303.tar.xz linux-dev-b18bf9733c4ca4db6fdb692895fabc9d934b7303.zip | |
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>
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions