diff options
| author | Kalle Valo <kvalo@codeaurora.org> | 2020-08-04 14:02:54 +0300 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2020-08-04 14:02:54 +0300 |
| commit | 2cfd71f1a43e9e1053db6c84f2dc33fe88128f67 (patch) | |
| tree | 777ad43d30e00597687256da0d5a1f966df99f3e /net/core/devlink.c | |
| parent | 3dc05ffb04436020f63138186dbc4f37bd938552 (diff) | |
| parent | 1cfd3426ef989b83fa6176490a38777057e57f6c (diff) | |
| download | linux-2cfd71f1a43e9e1053db6c84f2dc33fe88128f67.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git
mt76 driver had major conflicts within mt7615 directory. To make it easier for
every merge wireless-drivers to wireless-drivers-next and solve those
conflicts.
Diffstat (limited to 'net/core/devlink.c')
0 files changed, 0 insertions, 0 deletions