diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-04 17:51:16 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-04 17:51:16 -0800 |
| commit | b80e8e2811ecb2ace7ff851d887fe8b6db4425bf (patch) | |
| tree | 057459dc4eaa157e1894e02d14b08a1b3e2a0296 /arch/x86/kernel/.gitignore | |
| parent | ed385c7a1752e6a87622e5a2a80808cfb8917305 (diff) | |
| parent | bfc6b97d528def357adcbdadf71b21c8e5f7dbc4 (diff) | |
| download | linux-b80e8e2811ecb2ace7ff851d887fe8b6db4425bf.tar.bz2 | |
Merge tag 'pm+acpi-4.5-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull power management and ACPI fixes from Rafael Wysocki:
"Two build fixes for cpufreq drivers (including one for breakage
introduced recently) and a fix for a graph tracer crash when used over
suspend-to-RAM on x86.
Specifics:
- Prevent the graph tracer from crashing when used over suspend-to-
RAM on x86 by pausing it before invoking do_suspend_lowlevel() and
un-pausing it when that function has returned (Todd Brandt).
- Fix build issues in the qoriq and mediatek cpufreq drivers related
to broken dependencies on THERMAL (Arnd Bergmann)"
* tag 'pm+acpi-4.5-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
PM / sleep / x86: Fix crash on graph trace through x86 suspend
cpufreq: mediatek: allow building as a module
cpufreq: qoriq: allow building as module with THERMAL=m
Diffstat (limited to 'arch/x86/kernel/.gitignore')
0 files changed, 0 insertions, 0 deletions