Merge branch 'pm-qos' into acpi-dev-pm (dea553e3) · Commits · E-EXK4 - Operating System Group / projects / Linux · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

L

Linux
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

dea553e3

Commit dea553e3 authored 12 years ago by Rafael J. Wysocki

Downloads
- Plain Diff

Merge branch 'pm-qos' into acpi-dev-pm

Material in the 'acpi-dev-pm' branch depends on 'pm-qos' commits.

parents 77b67063 7e4d6844

No related branches found

No related tags found

No related merge requests found

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

Documentation/ABI/testing/sysfs-devices-power 31 additions, 0 deletions

Documentation/ABI/testing/sysfs-devices-power
Documentation/power/pm_qos_interface.txt 1 addition, 1 deletion

Documentation/power/pm_qos_interface.txt
drivers/acpi/sleep.c 17 additions, 4 deletions

drivers/acpi/sleep.c
drivers/base/power/domain.c 10 additions, 1 deletion

drivers/base/power/domain.c
drivers/base/power/power.h 4 additions, 2 deletions

drivers/base/power/power.h
drivers/base/power/qos.c 246 additions, 62 deletions

drivers/base/power/qos.c
drivers/base/power/sysfs.c 85 additions, 9 deletions

drivers/base/power/sysfs.c
drivers/mtd/nand/sh_flctl.c 3 additions, 1 deletion

drivers/mtd/nand/sh_flctl.c
drivers/pci/pci-acpi.c 7 additions, 1 deletion

drivers/pci/pci-acpi.c
include/linux/pm.h 1 addition, 2 deletions

include/linux/pm.h
include/linux/pm_qos.h 73 additions, 4 deletions

include/linux/pm_qos.h
kernel/power/qos.c 63 additions, 0 deletions

kernel/power/qos.c

with 541 additions and 87 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