diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-23 06:08:52 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-23 06:08:52 +0200 |
| commit | 68d0080f1e222757c85606d3eaf81b5c4aa7719f (patch) | |
| tree | 5f177f7571a56e7dfe3888f67fcc86532be8235c /drivers/net/hp100.c | |
| parent | mm, hotplug: protect zonelist building with zonelists_mutex (diff) | |
| parent | PCI / PM: Block races between runtime PM and system sleep (diff) | |
| download | linux-68d0080f1e222757c85606d3eaf81b5c4aa7719f.tar.xz linux-68d0080f1e222757c85606d3eaf81b5c4aa7719f.zip | |
Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6
* 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
PCI / PM: Block races between runtime PM and system sleep
PM / Domains: Update documentation
PM / Runtime: Handle clocks correctly if CONFIG_PM_RUNTIME is unset
PM: Fix async resume following suspend failure
PM: Free memory bitmaps if opening /dev/snapshot fails
PM: Rename dev_pm_info.in_suspend to is_prepared
PM: Update documentation regarding sysdevs
PM / Runtime: Update doc: usage count no longer incremented across system PM
Diffstat (limited to 'drivers/net/hp100.c')
0 files changed, 0 insertions, 0 deletions