diff options
| author | Kalle Valo <kvalo@codeaurora.org> | 2016-07-10 21:02:20 +0300 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2016-07-10 21:07:29 +0300 |
| commit | 8a185006bce519738fe06350aa8d5195e9a1da62 (patch) | |
| tree | 5b10f3cb75949f721cf3f91c2f8ddcc87c06aaae /drivers/net/wireless/marvell/mwifiex/scan.c | |
| parent | 238ad2ddf34bb3cd13f0f86c0d1b112bf9ef43ac (diff) | |
| parent | 034fdd4a17ff089c2428ece18efa65c5396810d2 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git
This is to fix some conflicts in iwlwifi.
Conflicts:
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
drivers/net/wireless/intel/iwlwifi/mvm/scan.c
Diffstat (limited to 'drivers/net/wireless/marvell/mwifiex/scan.c')
0 files changed, 0 insertions, 0 deletions