path: root/net/core/skbuff.c
diff options
authorLinus Torvalds <>2016-04-21 14:29:34 -0700
committerLinus Torvalds <>2016-04-21 14:29:34 -0700
commitf78fe0817a20b09d7830ec88869ed83c3d205a40 (patch)
tree25ec8bfde0335af4ebbe2ace22c011b4fdc51bb4 /net/core/skbuff.c
parentc5edde3a81149d29ceae4221f09f4c7bc2f70846 (diff)
parent395da1259ac3e3fdc70636a854c993ddb76c6169 (diff)
Merge tag 'pm+acpi-4.6-rc5' of git://
Pull power management fixes from Rafael Wysocki: "Two fixes for issues introduced recently, one for an intel_pstate driver problem uncovered by the recent switch over from using timers and the other one for a potential cpufreq core problem related to system suspend/resume. Specifics: - Fix an intel_pstate driver problem causing CPUs to get stuck in the highest P-state when completely idle uncovered by the recent switch over from using timers (Rafael Wysocki). - Avoid attempts to get the current CPU frequency when all devices (like I2C controllers that may be nedded for that purpose) have been suspended during system suspend/resume (Rafael Wysocki)" * tag 'pm+acpi-4.6-rc5' of git:// cpufreq: Abort cpufreq_update_current_freq() for cpufreq_suspended set intel_pstate: Avoid getting stuck in high P-states when idle
Diffstat (limited to 'net/core/skbuff.c')
0 files changed, 0 insertions, 0 deletions