diff options
| author | David S. Miller <davem@davemloft.net> | 2020-05-24 22:47:27 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-05-24 22:47:27 +0200 |
| commit | 13209a8f7304a34158f4366e8ea07a1965c05ac7 (patch) | |
| tree | f25ba4846fe02a32d4a14ef1a6be3227363da919 /net/ethtool/common.c | |
| parent | ethtool: propagate get_coalesce return value (diff) | |
| parent | Merge tag 'efi-urgent-2020-05-24' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
| download | linux-13209a8f7304a34158f4366e8ea07a1965c05ac7.tar.xz linux-13209a8f7304a34158f4366e8ea07a1965c05ac7.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
The MSCC bug fix in 'net' had to be slightly adjusted because the
register accesses are done slightly differently in net-next.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ethtool/common.c')
0 files changed, 0 insertions, 0 deletions