diff options
| author | Kalle Valo <[email protected]> | 2017-10-16 14:06:54 +0000 |
|---|---|---|
| committer | Kalle Valo <[email protected]> | 2017-10-16 14:09:24 +0000 |
| commit | 0fac9e2dff00a2344ffc81d82749181ffae408a2 (patch) | |
| tree | 1399ce5ce12955c971c4727dd70bc8b4db2754f1 /drivers/net/wireless/intel/iwlwifi/mvm/utils.c | |
| parent | rsi: fix integer overflow warning (diff) | |
| parent | Merge tag 'iwlwifi-for-kalle-2017-10-06' of git://git.kernel.org/pub/scm/linu... (diff) | |
| download | kernel-0fac9e2dff00a2344ffc81d82749181ffae408a2.tar.gz kernel-0fac9e2dff00a2344ffc81d82749181ffae408a2.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git
Mark Brown reported that there are conflicts in iwlwifi between the two trees
so fix those now.
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/mvm/utils.c')
0 files changed, 0 insertions, 0 deletions