Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6: PM: PM QOS update fix Freezer / cgroup freezer: Update stale locking comments PM / platform_bus: Allow runtime PM by default i2c: Fix bus-level power management callbacks PM QOS update PM / Hibernate: Fix block_io.c printk warning PM / Hibernate: Group swap ops PM / Hibernate: Move the first_sector out of swsusp_write PM / Hibernate: Separate block_io PM / Hibernate: Snapshot cleanup FS / libfs: Implement simple_write_to_buffer PM / Hibernate: document open(/dev/snapshot) side effects PM / Runtime: Add sysfs debug files PM: Improve device power management document PM: Update device power management document PM: Allow runtime_suspend methods to call pm_schedule_suspend() PM: pm_wakeup - switch to using bool
Showing
- Documentation/power/devices.txt 483 additions, 364 deletionsDocumentation/power/devices.txt
- Documentation/power/pm_qos_interface.txt 25 additions, 23 deletionsDocumentation/power/pm_qos_interface.txt
- Documentation/power/userland-swsusp.txt 4 additions, 0 deletionsDocumentation/power/userland-swsusp.txt
- drivers/acpi/processor_idle.c 1 addition, 1 deletiondrivers/acpi/processor_idle.c
- drivers/base/platform.c 3 additions, 3 deletionsdrivers/base/platform.c
- drivers/base/power/runtime.c 5 additions, 5 deletionsdrivers/base/power/runtime.c
- drivers/base/power/sysfs.c 62 additions, 3 deletionsdrivers/base/power/sysfs.c
- drivers/cpuidle/governors/ladder.c 1 addition, 1 deletiondrivers/cpuidle/governors/ladder.c
- drivers/cpuidle/governors/menu.c 1 addition, 1 deletiondrivers/cpuidle/governors/menu.c
- drivers/i2c/i2c-core.c 97 additions, 69 deletionsdrivers/i2c/i2c-core.c
- drivers/net/e1000e/netdev.c 12 additions, 10 deletionsdrivers/net/e1000e/netdev.c
- drivers/net/igbvf/netdev.c 4 additions, 2 deletionsdrivers/net/igbvf/netdev.c
- drivers/net/wireless/ipw2x00/ipw2100.c 6 additions, 5 deletionsdrivers/net/wireless/ipw2x00/ipw2100.c
- fs/libfs.c 35 additions, 0 deletionsfs/libfs.c
- include/linux/fs.h 2 additions, 0 deletionsinclude/linux/fs.h
- include/linux/netdevice.h 4 additions, 0 deletionsinclude/linux/netdevice.h
- include/linux/pm_qos_params.h 8 additions, 6 deletionsinclude/linux/pm_qos_params.h
- include/linux/pm_runtime.h 7 additions, 0 deletionsinclude/linux/pm_runtime.h
- include/linux/pm_wakeup.h 24 additions, 14 deletionsinclude/linux/pm_wakeup.h
- include/sound/pcm.h 2 additions, 1 deletioninclude/sound/pcm.h
Loading
Please register or sign in to comment