summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'pm-drivers'Rafael J. Wysocki2012-07-1918-150/+104
|\
| * rtc-cmos: report wakeups from interrupt handlerPaul Fox2012-07-171-0/+1
| * PM / crypto / ux500: Use struct dev_pm_ops for power managementRafael J. Wysocki2012-07-102-38/+34
| * PM / IPMI: Remove empty legacy PCI PM callbacksRafael J. Wysocki2012-07-101-16/+0
| * tpm_nsc: Use struct dev_pm_ops for power managementRafael J. Wysocki2012-07-101-11/+2
| * tpm_tis: Use struct dev_pm_ops for power managementRafael J. Wysocki2012-07-101-9/+7
| * tpm_atmel: Use struct dev_pm_ops for power managementRafael J. Wysocki2012-07-101-10/+2
| * PM / TPM: Drop unused pm_message_t argument from tpm_pm_suspend()Rafael J. Wysocki2012-07-105-6/+6
| * omap-rng: Use struct dev_pm_ops for power managementRafael J. Wysocki2012-07-101-6/+7
| * mg_disk: Use struct dev_pm_ops for power managementRafael J. Wysocki2012-07-061-6/+7
| * msi-laptop: Use struct dev_pm_ops for power managementRafael J. Wysocki2012-07-061-3/+4
| * hdaps: Use struct dev_pm_ops for power managementRafael J. Wysocki2012-07-031-2/+4
| * sonypi: Use struct dev_pm_ops for power managementRafael J. Wysocki2012-07-011-6/+7
| * intel_mid_thermal: Use struct dev_pm_ops for power managementRafael J. Wysocki2012-07-011-7/+9
| * acer-wmi: Use struct dev_pm_ops for power managementRafael J. Wysocki2012-07-011-5/+5
| * intel_ips: Remove empty legacy PM callbacksRafael J. Wysocki2012-07-011-17/+0
| * thinkpad_acpi: Use struct dev_pm_ops instead of legacy PM routinesRafael J. Wysocki2012-07-011-5/+6
| * thinkpad_acpi: Drop pm_message_t arguments from suspend routinesRafael J. Wysocki2012-07-011-6/+6
* | Merge branch 'pm-acpi'Rafael J. Wysocki2012-07-1922-118/+148
|\ \
| * | olpc-xo15-sci: Use struct dev_pm_ops for power managementRafael J. Wysocki2012-07-121-2/+4
| * | ACPI / PM: Drop PM callbacks from the ACPI bus typeRafael J. Wysocki2012-07-011-51/+0
| * | ACPI / PM: Drop legacy driver PM callbacks that are not used any moreRafael J. Wysocki2012-07-011-4/+0
| * | ACPI / PM: Do not execute legacy driver PM callbacksRafael J. Wysocki2012-07-011-15/+9
| * | acpi_power_meter: Use struct dev_pm_ops for power managementRafael J. Wysocki2012-07-011-4/+9
| * | fujitsu-tablet: Use struct dev_pm_ops for power managementRafael J. Wysocki2012-07-011-3/+5
| * | classmate-laptop: Use struct dev_pm_ops for power managementRafael J. Wysocki2012-07-011-5/+8
| * | xo15-ebook: Use struct dev_pm_ops for power managementRafael J. Wysocki2012-07-011-3/+5
| * | toshiba_bluetooth: Use struct dev_pm_ops for power managementRafael J. Wysocki2012-07-011-4/+6
| * | panasonic-laptop: Use struct dev_pm_ops for power managementRafael J. Wysocki2012-07-011-5/+11
| * | sony-laptop: Use struct dev_pm_ops for power managementRafael J. Wysocki2012-07-011-8/+12
| * | hp_accel: Use struct dev_pm_ops for power managementRafael J. Wysocki2012-07-011-7/+8
| * | toshiba_acpi: Use struct dev_pm_ops for power managementRafael J. Wysocki2012-07-011-6/+8
| * | ACPI: Use struct dev_pm_ops for power management in the SBS driverRafael J. Wysocki2012-07-011-4/+6
| * | ACPI: Use struct dev_pm_ops for power management in the power driverRafael J. Wysocki2012-07-011-4/+8
| * | ACPI: Use struct dev_pm_ops for power management in the button driverRafael J. Wysocki2012-07-011-3/+6
| * | ACPI: Use struct dev_pm_ops for power management in the battery driverRafael J. Wysocki2012-07-011-4/+11
| * | ACPI: Use struct dev_pm_ops for power management in the AC driverRafael J. Wysocki2012-07-011-5/+12
| * | ACPI: Use struct dev_pm_ops for power management in processor driverRafael J. Wysocki2012-07-013-6/+8
| * | ACPI: Use struct dev_pm_ops for power management in the thermal driverRafael J. Wysocki2012-07-011-7/+10
| * | ACPI: Use struct dev_pm_ops for power management in the fan driverRafael J. Wysocki2012-07-011-10/+11
| * | ACPI / PM: Make acpi_bus_type use driver struct dev_pm_ops callbacksRafael J. Wysocki2012-07-011-13/+47
| * | ACPI / PM: Make acpi_bus_type use struct dev_pm_ops for PM handlingRafael J. Wysocki2012-07-011-3/+4
| * | ACPI / PM: Drop pm_message_t argument from device suspend callbackRafael J. Wysocki2012-07-018-11/+9
| |/
* | Merge branch 'pm-sleep'Rafael J. Wysocki2012-07-1912-35/+191
|\ \
| * | PM / Sleep: Require CAP_BLOCK_SUSPEND to use wake_lock/wake_unlockRafael J. Wysocki2012-07-191-0/+7
| * | Merge branch 'fixes' into pm-sleepRafael J. Wysocki2012-07-18354-2061/+3390
| |\ \
| * | | PM / Sleep: Add missing static storage class specifiers in main.cSachin Kamat2012-07-181-4/+4
| * | | PM / Sleep: Fix build warning in sysfs.c for CONFIG_PM_SLEEP unsetRafael J. Wysocki2012-07-121-0/+4
| * | | PM / Hibernate: Print hibernation/thaw progress indicator one line at a time.Bojan Smojver2012-07-011-27/+27
| * | | PM / Sleep: Separate printing suspend times from initcall_debugRafael J. Wysocki2012-07-015-47/+54