diff options
| author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2015-05-26 18:20:34 +0200 |
|---|---|---|
| committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2015-05-26 18:20:57 +0200 |
| commit | 04c9599d1a4cdd91b4c0bded3b12cc8203b68a2c (patch) | |
| tree | 9863c0473469c5b594ad0e5dab29d37b6900bdf8 /.mailmap | |
| parent | iwlwifi: mvm: include wildcard SSID in scans (diff) | |
| parent | iwlwifi: mvm: avoid use-after-free on iwl_mvm_d0i3_enable_tx() (diff) | |
| download | linux-04c9599d1a4cdd91b4c0bded3b12cc8203b68a2c.tar.xz linux-04c9599d1a4cdd91b4c0bded3b12cc8203b68a2c.zip | |
Merge remote-tracking branch 'iwlwifi-fixes/master' into iwlwifi-next
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Conflicts:
drivers/net/wireless/iwlwifi/Kconfig
Diffstat (limited to '.mailmap')
0 files changed, 0 insertions, 0 deletions