diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-12 22:19:38 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-12 22:19:38 +0200 |
| commit | 98db5e5503c21c27705c49ebda782b4252b5f7a7 (patch) | |
| tree | b7f3cec0f0fbea2a8187991219e633a14d32eaa5 /drivers/memstick | |
| parent | Merge tag 'ntb-4.18' of git://github.com/jonmason/ntb (diff) | |
| parent | Merge branches 'thermal-core' and 'thermal-intel' into next (diff) | |
| download | linux-98db5e5503c21c27705c49ebda782b4252b5f7a7.tar.xz linux-98db5e5503c21c27705c49ebda782b4252b5f7a7.zip | |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
Pull thermal updates from Zhang Rui:
"Thermal core and intel thermal drivers:
- convert thermal sysfs attributes to use DEVICE_ATTR_{RO|RW|WO}()
variants (Viresh Kumar)
- update license to SPDX format (Lina Iyer)
- add GeminiLake support for int340x processor_thermal driver (Sumeet
Pawnikar)
- prevent error in reading trip hysteresis attribute for int340x
thermal driver (Srinivas Pandruvada)"
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux:
thermal: int340x: processor_thermal: Add GeminiLake support
drivers: thermal: Update license to SPDX format
thermal: int340x: Prevent error in reading trip hysteresis attribute
thermal: Use DEVICE_ATTR_{RO|RW|WO}() variants
thermal: Shorten name of sysfs callbacks
Diffstat (limited to 'drivers/memstick')
0 files changed, 0 insertions, 0 deletions