summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/sleep.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'acpi-assorted'Rafael J. Wysocki2013-02-151-0/+8
|\
| * ACPI: Add DMI entry for Sony VGN-FW41E_HJoseph Salisbury2013-02-061-0/+8
* | ACPI / PM: Consolidate suspend-specific and hibernate-specific codeRafael J. Wysocki2013-01-191-36/+51
* | ACPI: Drop power resources driverRafael J. Wysocki2013-01-171-0/+2
|/
* Merge branch 'acpi-general'Rafael J. Wysocki2012-12-041-171/+177
|\
| * ACPI: do acpisleep dmi check when CONFIG_ACPI_SLEEP is setZhang Rui2012-11-301-171/+177
* | Merge branch 'acpi-general'Rafael J. Wysocki2012-11-291-1/+24
|\|
| * ACPI / PM: Add Sony Vaio VPCEB1S1E to nonvs blacklist.Lan Tianyu2012-11-211-0/+8
| * ACPI / Sleep: add acpi_sleep=nonvs_s3 parameterKristen Carlson Accardi2012-11-151-1/+16
* | ACPI / PM: Move device PM functions related to sleep statesRafael J. Wysocki2012-11-151-57/+6
* | ACPI / PM: Split device wakeup management routinesRafael J. Wysocki2012-11-151-5/+3
* | ACPI / PM: Move runtime remote wakeup setup routine to device_pm.cRafael J. Wysocki2012-11-151-39/+0
* | ACPI / PM: Move device power state selection routine to device_pm.cRafael J. Wysocki2012-11-151-85/+3
* | ACPI / PM: Fix device PM kernedoc comments and #ifdefsRafael J. Wysocki2012-11-151-29/+24
* | PM / ACPI: Take device PM QoS flags into accountRafael J. Wysocki2012-10-241-4/+17
|/
*---. Merge branches 'delete-gts-bfs', 'misc', 'novell-bugzilla-757888-numa' and 'o...Len Brown2012-08-031-6/+22
|\ \ \
| | * | Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/...Linus Torvalds2012-07-261-1/+1
| | |\|
| | * | Merge branch 'master' [vanilla Linus master] into libata-dev.git/upstreamJeff Garzik2012-07-251-5/+19
| | |\ \
| | | * | ACPI/PM: specify lowest allowed state for device sleep stateHuang Ying2012-06-231-5/+19
| | * | | libata-acpi: add ata port runtime D3Cold supportLin Ming2012-06-291-0/+2
| | |/ /
| * / / ACPI / PM: Fix build warning in sleep.c for CONFIG_ACPI_SLEEP unsetRafael J. Wysocki2012-07-261-1/+1
| |/ /
* | / ACPI: delete _GTS/_BFS supportLen Brown2012-07-301-64/+9
| |/ |/|
| |
| \
| \
| \
| \
| \
*-----. \ Merge branches 'acpi_pad', 'acpica', 'apei-bugzilla-43282', 'battery', 'cpuid...Len Brown2012-07-261-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| | | | * Merge branches 'bugfix-battery', 'bugfix-misc', 'bugfix-rafael', 'bugfix-turb...Len Brown2012-06-041-12/+51
| | | |/|\ | | |/| |
| * / | | ACPICA: Remove argument of acpi_os_wait_events_completeLin Ming2012-06-011-1/+1
| |/ / /
* | | | Merge branch 'pm-acpi' of git://git.kernel.org/pub/scm/linux/kernel/git/rafae...Linus Torvalds2012-06-031-4/+45
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | ACPI / PM: Make acpi_pm_device_sleep_state() follow the specificationRafael J. Wysocki2012-05-291-2/+2
| * | ACPI / PM: Generate wakeup events on fixed power buttonDaniel Drake2012-05-291-2/+43
| |/
* | x86, realmode: Unbreak the ia64 build of drivers/acpi/sleep.cH. Peter Anvin2012-05-301-6/+2
* | Merge branch 'x86-trampoline-for-linus' of git://git.kernel.org/pub/scm/linux...Linus Torvalds2012-05-291-3/+5
|\ \
| * | x86, realmode: don't copy real_mode_headerJarkko Sakkinen2012-05-081-1/+1
| * | x86, realmode: Move ACPI wakeup to unified realmode codeJarkko Sakkinen2012-05-081-3/+5
| |/
* / acpi: use KERN_CONT in printk() continuation linesKay Sievers2012-05-081-4/+4
|/
* ACPI: Convert wake_sleep_flags to a value instead of functionKonrad Rzeszutek Wilk2012-04-231-24/+28
* Merge branch 'd3' into releaseLen Brown2012-03-301-0/+35
|\
| * ACPI, PCI: Move acpi_dev_run_wake() to ACPI coreLin Ming2012-03-301-0/+35
* | ACPI: Move module parameter gts and bfs to sleep.cLin Ming2012-03-261-7/+31
* | ACPICA: Sleep/Wake interfaces: optionally execute _GTS and _BFSLin Ming2012-03-261-6/+7
* | ACPICA: Clarify METHOD_NAME* defines for full-pathname casesBob Moore2012-03-221-2/+2
|/
* ACPI / PM: Add Sony Vaio VPCCW29FX to nonvs blacklist.Lan Tianyu2012-01-211-0/+8
* ACPI / PM: Do not save/restore NVS on Asus K54C/K54HRKeng-Yu Lin2011-12-061-0/+16
* ACPI / PM: Add Sony VPCEB17FX to nonvs blacklistDave Jones2011-11-041-0/+8
* ACPI / PM: Add Sony VGN-FW21E to nonvs blacklist.Dave Jones2011-10-221-0/+8
* PM / ACPI: Blacklist Vaio VGN-FW520F machine known to require acpi_sleep=nonvsBogdan Radulescu2011-10-161-0/+8
* PM / ACPI: Blacklist Sony Vaio known to require acpi_sleep=nonvsRafael J. Wysocki2011-10-161-0/+8
* ACPI: DMI workaround for Asus A8N-SLI Premium and Asus A8N-SLI DELUXZhang Rui2011-07-301-0/+16
* Merge branch 'linus' into releaseLen Brown2011-03-231-2/+3
|\
| * Merge branch 'x86-trampoline-for-linus' of git://git.kernel.org/pub/scm/linux...Linus Torvalds2011-03-161-0/+1
| |\
| | * x86, trampoline: Use the unified trampoline setup for ACPI wakeupH. Peter Anvin2011-02-171-0/+1
| * | PM: Remove CONFIG_PM_OPSRafael J. Wysocki2011-03-151-2/+2
| |/