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/af_unix.c | |
| parent | thermal: thermal_hwmon: Convert to hwmon_device_register_with_info() (diff) | |
| parent | thermal/x86 pkg temp: Remove debugfs_create_u32() casts (diff) | |
| parent | Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalent... (diff) | |
| download | linux-134f4010799a30acd969e603985c27b9f3e6f58d.tar.gz linux-134f4010799a30acd969e603985c27b9f3e6f58d.zip | |
Merge branches 'thermal-core', 'thermal-intel' and 'thermal-soc' into next