| commit | 446bf64b613c4433dac4b15f4eaf326beaad3c8e | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Mon Aug 19 11:54:03 2019 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Mon Aug 19 11:54:03 2019 -0700 |
| tree | b20b9457234f6f9a5d7464213ef6d10f95f3eed3 | |
| parent | 20e79a0a2cfd15b6cfb18119f2e108396be56716 [diff] | |
| parent | 06821504fd47a5e5b641aeeb638a0ae10a216ef8 [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net Merge conflict of mlx5 resolved using instructions in merge commit 9566e650bf7fdf58384bb06df634f7531ca3a97e. Signed-off-by: David S. Miller <davem@davemloft.net>