diff options
| author | Zhang Rui <rui.zhang@intel.com> | 2018-01-15 13:57:18 +0800 |
|---|---|---|
| committer | Zhang Rui <rui.zhang@intel.com> | 2018-01-15 13:57:18 +0800 |
| commit | 134f4010799a30acd969e603985c27b9f3e6f58d (patch) | |
| tree | d700fd6a304367502c79ada3606cd4ff4951317e /net/unix/sysctl_net_unix.c | |
| parent | e782bc169cd02d3411a6db6ff0c26d7f27f8b81a (diff) | |
| parent | e74c2d65ff2e3607e392ae3e779da47135c85966 (diff) | |
| parent | 90ce8dfafafdf416547b1c057fdbc868a3ab8d94 (diff) | |
Merge branches 'thermal-core', 'thermal-intel' and 'thermal-soc' into next