summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/sleep.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/...Linus Torvalds2011-01-131-3/+10
|\
| * Merge branch 'suspend-ioremap-cache' into releaseLen Brown2011-01-121-3/+2
| |\
| | * PM: Fix oops in suspend/hibernate code related to failing ioremap()Jiri Slaby2011-01-071-3/+2
| * | ACPI / PM: Blacklist Averatec machine known to require acpi_sleep=nonvsRafael J. Wysocki2011-01-071-0/+8
| |/
* | Merge branch 'master' into for-nextJiri Kosina2010-12-221-2/+10
|\ \ | |/
| * Merge branch 'bugzilla-23002' into releaseLen Brown2010-12-131-0/+8
| |\
| | * ACPI / PM: Do not save/restore NVS on Sony Vaio VGN-NW130DRafael J. Wysocki2010-12-131-0/+8
| * | ACPI: eliminate unused variable warning for !ACPI_SLEEPJan Beulich2010-12-111-2/+2
| |/
* | suspend: constify platform_suspend_opsLionel Debroux2010-11-161-2/+2
* | hibernation: constify platform_hibernation_opsLionel Debroux2010-11-161-2/+2
|/
* Merge branch 'misc' into releaseLen Brown2010-10-261-2/+10
|\
| * ACPI / PM: Blacklist another machine that needs acpi_sleep=nonvsRafael J. Wysocki2010-10-251-0/+8
| * ACPI: static sleep_states[] and acpi_gts_bfs_checkStephen Hemminger2010-10-191-2/+2
* | ACPI / PM: Fix problems with acpi_pm_device_sleep_state()Rafael J. Wysocki2010-10-151-6/+10
|/
* PM / ACPI: Blacklist systems known to require acpi_sleep=nonvsRafael J. Wysocki2010-09-241-0/+22
* Merge branch 'acpica-gpe' into releaseLen Brown2010-08-151-12/+3
|\
| * ACPICA: Introduce acpi_gpe_wakeup()Rafael J. Wysocki2010-07-061-12/+3
* | Merge branch 'nvs' into releaseLen Brown2010-08-141-39/+21
|\ \
| * | ACPI / Sleep: Drop acpi_suspend_finish()Rafael J. Wysocki2010-07-061-7/+2
| * | ACPI / Sleep: Consolidate suspend and hibernation routinesRafael J. Wysocki2010-07-061-26/+16
| * | ACPI / Wakeup: Simplify enabling of wakeup devicesRafael J. Wysocki2010-07-061-3/+2
| * | ACPI / Sleep: Rework enabling wakeup devicesRafael J. Wysocki2010-07-061-4/+2
| * | ACPI / Sleep: Free NVS copy if suspending of devices failsRafael J. Wysocki2010-07-061-1/+1
| |/
* | ACPI / Sleep: Allow the NVS saving to be skipped during suspend to RAMRafael J. Wysocki2010-07-241-18/+17
|/
* Merge branch 'bugzilla-13931-sleep-nvs' into releaseLen Brown2010-06-121-15/+19
|\
| * ACPI: Store NVS state even when entering suspend to RAMMatthew Garrett2010-06-101-8/+13
| * suspend: Move NVS save/restore code to generic suspend functionalityMatthew Garrett2010-06-101-6/+6
* | Merge branches 'bugzilla-14668' and 'misc-2.6.35' into releaseLen Brown2010-06-011-155/+2
|\ \ | |/
| * ACPI: Unconditionally set SCI_EN on resumeMatthew Garrett2010-05-121-155/+2
* | ACPI / EC / PM: Fix names of functions that block/unblock EC transactionsRafael J. Wysocki2010-05-281-6/+6
* | ACPI / EC / PM: Fix race between EC transactions and system suspendRafael J. Wysocki2010-05-281-26/+29
|/
* ACPI: sleep: eliminate duplicate entries in acpisleep_dmi_table[]Alex Chiang2010-05-111-89/+1
* ACPI: sleep: init_set_sci_en_on_resume for Dell Studio 155xKamal Mostafa2010-05-061-0/+24
* ACPI: DMI init_set_sci_en_on_resume for multiple Lenovo ThinkPadsAlex Chiang2010-05-051-0/+120
*---. Merge branches 'battery-2.6.34', 'bugzilla-10805', 'bugzilla-14668', 'bugzill...Len Brown2010-03-141-8/+26
|\ \ \
| | | * ACPI: Use GPE reference counting to support shared GPEsRafael J. Wysocki2010-02-221-3/+12
| |_|/ |/| |
| * | ACPI / EC / PM: Close race between EC and resume from hibernationRafael J. Wysocki2010-03-081-5/+14
|/ /
* | ACPI: introduce kernel parameter acpi_sleep=sci_force_enableZhang Rui2009-12-301-12/+17
|/
* ACPI: DMI init_set_sci_en_on_resume for HP-Compaq C700Len Brown2009-11-231-0/+8
* ACPI: sleep: another HP/Compaq DMI entries for init_set_sci_en_on_resumeVaibhav Verma2009-11-051-0/+16
* ACPI: add DMI entry for SCI_EN resume quirk on HP dv4Gustavo Maciel Dias Vieira2009-11-051-0/+8
* Merge branch 'linus' into releaseLen Brown2009-09-191-3/+9
|\
| * PCI / ACPI PM: Propagate wake-up enable for devices w/o ACPI supportRafael J. Wysocki2009-09-091-1/+1
| * PCI / ACPI PM: Rework some debug messagesRafael J. Wysocki2009-09-091-2/+8
* | ACPI: sleep: another HP DMI entry for init_set_sci_en_on_resumeLen Brown2009-08-291-0/+8
|/
* PM / ACPI: HP G7000 Notebook needs a SCI_EN resume quirkBartlomiej Zolnierkiewicz2009-07-291-0/+8
* Merge branch 'bugzilla-13041' into releaseLen Brown2009-04-241-0/+27
|\
| * ACPI: Disable _GTS and _BFS support by defaultLen Brown2009-04-171-0/+27
* | PM/Suspend: Introduce two new platform callbacks to avoid breakageRafael J. Wysocki2009-04-191-4/+4
|/
* Merge branch 'misc' into releaseLen Brown2009-04-051-0/+9
|\
OpenPOWER on IntegriCloud