Merge branch 'pm-sleep' (d715a226) · Commits · Martyn Welch / linux · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

L

linux
- Activity
- Members
- Labels
- Environments

Snippets Groups Projects

d715a226

Commit d715a226 authored 10 years ago by Rafael J. Wysocki

Downloads
- Plain Diff

Merge branch 'pm-sleep'

* pm-sleep:
  PM / sleep: trace events for device PM callbacks
  PM / sleep: trace events for suspend/resume

parents 589e18a9 e8bca479

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

drivers/acpi/sleep.c 3 additions, 0 deletions

drivers/acpi/sleep.c
drivers/base/power/main.c 26 additions, 4 deletions

drivers/base/power/main.c
drivers/base/syscore.c 5 additions, 0 deletions

drivers/base/syscore.c
include/trace/events/power.h 58 additions, 26 deletions

include/trace/events/power.h
kernel/cpu.c 5 additions, 0 deletions

kernel/cpu.c
kernel/power/hibernate.c 3 additions, 0 deletions

kernel/power/hibernate.c
kernel/power/process.c 3 additions, 0 deletions

kernel/power/process.c
kernel/power/suspend.c 12 additions, 2 deletions

kernel/power/suspend.c

with 115 additions and 32 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment