| commit | ddbe8db147cd0954da93dc6986f4793bcabb3889 | [log] [tgz] |
|---|---|---|
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | Tue Aug 05 22:49:45 2014 +0200 |
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | Tue Aug 05 22:49:45 2014 +0200 |
| tree | 0a0d463863ca78b644471132eb3f27ec3405b16d | |
| parent | b14c348e8dabcc7604683cfc44fad7396e8b639a [diff] | |
| parent | 0f7d83e85dbd5bb8032ebed7713edf59670fb074 [diff] |
Merge branch 'pm-sleep' * pm-sleep: PM / Hibernate: Touch Soft Lockup Watchdog in rtree_next_node PM / Hibernate: Remove the old memory-bitmap implementation PM / Hibernate: Iterate over set bits instead of PFNs in swsusp_free() PM / Hibernate: Implement position keeping in radix tree PM / Hibernate: Add memory_rtree_find_bit function PM / Hibernate: Create a Radix-Tree to store memory bitmap PM / sleep: fix kernel-doc warnings in drivers/base/power/main.c