Merge branch 'pm-sleep'

Browse source

* pm-sleep:
  PM / hibernate: fix a comment typo
  input: i8042: Avoid resetting controller on system suspend/resume
  PM / PCI / ACPI: Kick devices that might have been reset by firmware
  PM / sleep: Add flags to indicate platform firmware involvement
  PM / sleep: Drop pm_request_idle() from pm_generic_complete()
  PCI / PM: Avoid resuming more devices during system suspend
  PM / wakeup: wakeup_source_create: use kstrdup_const
  PM / sleep: Report interrupt that caused system wakeup

...

This commit is contained in:

Rafael J. Wysocki 2015-11-02 00:52:19 +01:00

parent 66c4487724 d439e64f22

commit 9bb4064ca3

16 changed files with 208 additions and 42 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

kernel/irq/pm.c

View file

2

kernel/power/hibernate.c

View file

17

kernel/power/main.c

View file

4

kernel/power/suspend.c

View file