summaryrefslogtreecommitdiffstats
path: root/kernel/power
Commit message (Expand)AuthorAgeFilesLines
*---. Merge branches 'pm-sleep', 'pm-cpufreq' and 'pm-cpuidle'Rafael J. Wysocki2014-08-111-1/+20
|\ \ \
| * | | PM / hibernate: avoid unsafe pages in e820 reserved regionsLee, Chun-Yi2014-08-061-1/+20
* | | | Merge tag 'pm+acpi-3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2014-08-066-218/+475
|\ \ \ \
| * | | | Merge branch 'pm-sleep'Rafael J. Wysocki2014-08-051-127/+367
| |\| | |
| | * | | PM / Hibernate: Touch Soft Lockup Watchdog in rtree_next_nodeJoerg Roedel2014-07-291-0/+1
| | * | | PM / Hibernate: Remove the old memory-bitmap implementationJoerg Roedel2014-07-291-202/+21
| | * | | PM / Hibernate: Iterate over set bits instead of PFNs in swsusp_free()Joerg Roedel2014-07-291-15/+38
| | * | | PM / Hibernate: Implement position keeping in radix treeJoerg Roedel2014-07-291-0/+98
| | * | | PM / Hibernate: Add memory_rtree_find_bit functionJoerg Roedel2014-07-291-3/+81
| | * | | PM / Hibernate: Create a Radix-Tree to store memory bitmapJoerg Roedel2014-07-291-1/+222
| | | | |
| | \ \ \
| *-. \ \ \ Merge branches 'pm-opp' and 'pm-general'Rafael J. Wysocki2014-07-271-3/+0
| |\ \ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | PM / OPP: Remove ARCH_HAS_OPPMark Brown2014-07-231-3/+0
| | | |_|/ | | |/| |
| | | | |
| | \ \ \
| *-. \ \ \ Merge branches 'pm-apm' and 'pm-sleep'Rafael J. Wysocki2014-07-274-84/+108
| |\ \ \ \ \ | | | |_|/ / | | |/| | / | | | | |/ | | | |/|
| | | * | PM / sleep: Move platform suspend operations to separate functionsRafael J. Wysocki2014-07-231-43/+77
| | | * | PM / sleep: Simplify sleep states sysfs interface codeRafael J. Wysocki2014-07-214-41/+31
| | | |/
| * | / PM: Create PM workqueue if runtime PM is not configured tooRafael J. Wysocki2014-07-231-4/+0
| | |/ | |/|
* | | Merge tag 'trace-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/roste...Linus Torvalds2014-08-042-8/+0
|\ \ \ | |/ / |/| |
| * | PM / Sleep: Remove ftrace_stop/start() from suspend and hibernateSteven Rostedt (Red Hat)2014-07-172-8/+0
| |/
* | PM / sleep: fix freeze_ops NULL pointer dereferencesZhang Rui2014-07-151-2/+2
* | PM / sleep: Fix request_firmware() error at resumeTakashi Iwai2014-07-151-0/+1
|/
* x86, kaslr: boot-time selectable with hibernationKees Cook2014-06-161-0/+6
* PM / hibernate: introduce "nohibernate" boot parameterKees Cook2014-06-163-5/+35
* Merge branch 'pm-sleep'Rafael J. Wysocki2014-06-123-2/+18
|\
| * PM / sleep: trace events for suspend/resumeTodd E Brandt2014-06-073-2/+18
| * Merge branch 'acpi-pm' into pm-sleepRafael J. Wysocki2014-06-072-1/+16
| |\
| | \
| \ \
| \ \
| \ \
*---. \ \ Merge branches 'pnp', 'powercap', 'pm-runtime' and 'pm-opp'Rafael J. Wysocki2014-06-031-2/+1
|\ \ \ \ \
| | | * | | PM / OPP: Make OPP invisible to users in KconfigMark Brown2014-05-191-2/+1
| | |/ / / | |/| | |
* | | | | Merge branch 'acpi-pm'Rafael J. Wysocki2014-06-031-0/+15
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge branch 'pm-sleep' into acpi-pmRafael J. Wysocki2014-05-202-9/+20
| |\ \ \ \
| * | | | | ACPI / PM: Hold ACPI scan lock over the "freeze" sleep stateRafael J. Wysocki2014-05-161-0/+15
| | |/ / / | |/| | |
* | | | | Merge branch 'pm-sleep'Rafael J. Wysocki2014-06-036-75/+114
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | PM / hibernate: fixed typo in commentNiv Yehezkel2014-06-011-1/+1
| * | | | PM / sleep: Introduce command line argument for sleep state enumerationRafael J. Wysocki2014-05-262-8/+36
| * | | | PM / sleep: Use valid_state() for platform-dependent sleep states onlyRafael J. Wysocki2014-05-264-37/+36
| * | | | PM / sleep: Add state field to pm_states[] entriesRafael J. Wysocki2014-05-264-27/+30
| | |/ / | |/| |
| * | | PM / hibernate: Fix memory corruption in resumedelay_setup()Dan Carpenter2014-05-161-2/+2
| * | | PM / hibernate: convert simple_strtoul to kstrtoulFabian Frederick2014-05-091-1/+4
| * | | Merge branch 'pm-cpuidle' into pm-sleepRafael J. Wysocki2014-05-071-0/+2
| |\ \ \
| * | | | PM / hibernate: no kernel_power_off when pm_power_off NULLSebastian Capella2014-05-011-2/+4
| * | | | PM / hibernate: use unsigned local variables in swsusp_show_speed()Chen Gang2014-04-281-5/+9
| | |_|/ | |/| |
* | | | Merge branch 'pm-cpuidle'Rafael J. Wysocki2014-06-031-0/+2
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| |
| * | PM / suspend: Always use deepest C-state in the "freeze" sleep stateRafael J. Wysocki2014-05-071-0/+2
| |/
* / asmlinkage: Add explicit __visible to drivers/*, lib/*, kernel/*Andi Kleen2014-05-051-1/+1
|/
* PM / suspend: Make cpuidle work in the "freeze" stateRafael J. Wysocki2014-04-211-0/+3
* kernel: use macros from compiler.h instead of __attribute__((...))Gideon Israel Dsouza2014-04-074-5/+8
*-. Merge branches 'pm-runtime' and 'pm-sleep'Rafael J. Wysocki2014-03-206-14/+20
|\ \
| | * PM: Add missing "freeze" stateGeert Uytterhoeven2014-03-121-2/+2
| | * PM / Hibernate: Spelling s/anonymouns/anonymous/Geert Uytterhoeven2014-03-121-1/+1
| | * PM / suspend: Remove unnecessary !!Viresh Kumar2014-03-111-1/+1
| | * PM / hibernate: use name_to_dev_t to parse resumeSebastian Capella2014-03-011-10/+12