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 / Runtime: Add runtime PM statistics (v3) PM / Runtime: Make runtime_status attribute not debug-only (v. 2) PM: Do not use dynamically allocated objects in pm_wakeup_event() PM / Suspend: Fix ordering of calls in suspend error paths PM / Hibernate: Fix snapshot error code path PM / Hibernate: Fix hibernation_platform_enter() pm_qos: Get rid of the allocation in pm_qos_add_request() pm_qos: Reimplement using plists plist: Add plist_last PM: Make it possible to avoid races between wakeup and system sleep PNPACPI: Add support for remote wakeup PM: describe kernel policy regarding wakeup defaults (v. 2) PM / Hibernate: Fix typos in comments in kernel/power/swap.c
No related branches found
No related tags found
Showing
- Documentation/ABI/testing/sysfs-power 15 additions, 0 deletionsDocumentation/ABI/testing/sysfs-power
- drivers/base/power/Makefile 1 addition, 1 deletiondrivers/base/power/Makefile
- drivers/base/power/main.c 1 addition, 0 deletionsdrivers/base/power/main.c
- drivers/base/power/runtime.c 47 additions, 7 deletionsdrivers/base/power/runtime.c
- drivers/base/power/sysfs.c 78 additions, 20 deletionsdrivers/base/power/sysfs.c
- drivers/base/power/wakeup.c 247 additions, 0 deletionsdrivers/base/power/wakeup.c
- drivers/net/e1000e/netdev.c 7 additions, 10 deletionsdrivers/net/e1000e/netdev.c
- drivers/net/igbvf/netdev.c 4 additions, 5 deletionsdrivers/net/igbvf/netdev.c
- drivers/net/wireless/ipw2x00/ipw2100.c 6 additions, 6 deletionsdrivers/net/wireless/ipw2x00/ipw2100.c
- drivers/pci/pci-acpi.c 1 addition, 0 deletionsdrivers/pci/pci-acpi.c
- drivers/pci/pci.c 19 additions, 1 deletiondrivers/pci/pci.c
- drivers/pci/pci.h 1 addition, 0 deletionsdrivers/pci/pci.h
- drivers/pci/pcie/pme/pcie_pme.c 4 additions, 1 deletiondrivers/pci/pcie/pme/pcie_pme.c
- drivers/pnp/core.c 3 additions, 0 deletionsdrivers/pnp/core.c
- drivers/pnp/pnpacpi/core.c 23 additions, 0 deletionsdrivers/pnp/pnpacpi/core.c
- include/linux/netdevice.h 1 addition, 1 deletioninclude/linux/netdevice.h
- include/linux/plist.h 29 additions, 0 deletionsinclude/linux/plist.h
- include/linux/pm.h 16 additions, 0 deletionsinclude/linux/pm.h
- include/linux/pm_qos_params.h 10 additions, 3 deletionsinclude/linux/pm_qos_params.h
- include/linux/pm_wakeup.h 7 additions, 3 deletionsinclude/linux/pm_wakeup.h
Loading
Please register or sign in to comment