diff options
| author |   Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2014-11-25 07:53:57 +0200 |
|---|---|---|
| committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2014-11-25 07:53:57 +0200 |
| commit | e7331845df48cd7905d0ac4452a9244446583e41 (patch) | |
| tree | 92a4d61292c467674b3202bb978bc249044e47a6 /kernel/sysctl_binary.c | |
| parent | iwlwifi: update the secure mem space and for the CPUs (diff) | |
| parent | iwlwifi: mvm: check TLV flag before trying to use hotspot firmware commands (diff) | |
Merge remote-tracking branch 'iwlwifi-fixes/master' into iwlwifi-next
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Conflicts:
drivers/net/wireless/iwlwifi/iwl-fw.h
Diffstat (limited to 'kernel/sysctl_binary.c')
0 files changed, 0 insertions, 0 deletions