diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-20 14:33:02 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-20 14:33:02 -0800 |
| commit | 2d360fcbd851b7f9f8c23b1c30b2f3c060fa43e6 (patch) | |
| tree | 8228db95030b82921c90b95f353441946af3a677 /arch/arm/include/asm/unistd.h | |
| parent | a767835f6dc85277e40fbfe69a29c18817d6c00b (diff) | |
| parent | 501a708f18ef911328ffd39f39738b8a7862aa8e (diff) | |
Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
* 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
PM / Suspend: Fix bug in suspend statistics update
PM / Hibernate: Fix the early termination of test modes
PM / shmobile: Fix build of sh7372_pm_init() for CONFIG_PM unset
PM Sleep: Do not extend wakeup paths to devices with ignore_children set
PM / driver core: disable device's runtime PM during shutdown
PM / devfreq: correct Kconfig dependency
PM / devfreq: fix use after free in devfreq_remove_device
PM / shmobile: Avoid restoring the INTCS state during initialization
PM / devfreq: Remove compiler error after irq.h update
PM / QoS: Properly use the WARN() macro in dev_pm_qos_add_request()
PM / Clocks: Only disable enabled clocks in pm_clk_suspend()
ARM: mach-shmobile: sh7372 A3SP no_suspend_console fix
PM / shmobile: Don't skip debugging output in pd_power_up()
Diffstat (limited to 'arch/arm/include/asm/unistd.h')
0 files changed, 0 insertions, 0 deletions