diff options
| author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2014-07-22 19:26:41 +0300 |
|---|---|---|
| committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2014-07-22 19:26:41 +0300 |
| commit | 917d083d48f50537b21c8761e2366bf229ed9f5d (patch) | |
| tree | f3021b3d4f3901e166e2bae61e41c73c88c7fd13 /drivers/net/wireless/ath/ath10k/pci.h | |
| parent | 8a275bad9c0369aefebda90748f91361934dd638 (diff) | |
| parent | 4601879419f94a89fcbf427b4d3bfbf4ce294174 (diff) | |
Merge branch 'iwlwifi-fixes' into iwlwifi-next
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Conflicts:
drivers/net/wireless/iwlwifi/mvm/mac80211.c
Diffstat (limited to 'drivers/net/wireless/ath/ath10k/pci.h')
0 files changed, 0 insertions, 0 deletions