diff options
author | Linus Torvalds | 2018-04-20 10:56:32 -0700 |
---|---|---|
committer | Linus Torvalds | 2018-04-20 10:56:32 -0700 |
commit | 83beed7b2b26f232d782127792dd0cd4362fdc41 (patch) | |
tree | 74acc56b826d5bbfc2b8955ce734481328e65a79 /net/ipv4/tcp.c | |
parent | 7e3cb169d3a9ef840db1b73609ebb9e7d20a2f1a (diff) | |
parent | e04907dbc25930b88ee2328fe692c776f63ddf2c (diff) |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal
Pull thermal fixes from Eduardo Valentin:
"A couple of fixes for the thermal subsystem"
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal:
dt-bindings: thermal: Remove "cooling-{min|max}-level" properties
dt-bindings: thermal: remove no longer needed samsung thermal properties
Diffstat (limited to 'net/ipv4/tcp.c')
0 files changed, 0 insertions, 0 deletions