diff options
| author | David S. Miller <davem@davemloft.net> | 2019-08-19 20:54:03 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-08-19 20:54:03 +0200 |
| commit | 446bf64b613c4433dac4b15f4eaf326beaad3c8e (patch) | |
| tree | b20b9457234f6f9a5d7464213ef6d10f95f3eed3 /tools/thermal | |
| parent | net: hns: add phy_attached_info() to the hns driver (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (diff) | |
| download | linux-446bf64b613c4433dac4b15f4eaf326beaad3c8e.tar.xz linux-446bf64b613c4433dac4b15f4eaf326beaad3c8e.zip | |
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>
Diffstat (limited to 'tools/thermal')
0 files changed, 0 insertions, 0 deletions