summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
*-. Merge branches 'acpi-tools' and 'pm-tools'Rafael J. Wysocki2014-01-177-16/+1599
|\ \
| | * PM / tools: new tool for suspend/resume performance optimizationTodd E Brandt2014-01-171-0/+1446
| | * cpupower: Fix sscanf robustness in cpufreq-setOne Thousand Gnomes2014-01-081-1/+1
| * | ACPICA: acpidump: Update MAINTAINERS file to include tools folder for ACPI/AC...Lv Zheng2014-01-161-0/+2
| * | ACPICA: acpidump: Enable tools Makefile to include acpi tools.Lv Zheng2014-01-161-3/+13
| * | ACPICA: acpidump: Cleanup tools/power/acpi makefiles.Lv Zheng2014-01-163-12/+137
* | | Merge branch 'acpi-modules'Rafael J. Wysocki2014-01-177-7/+127
|\ \ \
| * | | platform: introduce OF style 'modalias' support for platform busZhang Rui2014-01-173-0/+13
| * | | ACPI: fix module autoloading for ACPI enumerated devicesZhang Rui2014-01-163-1/+32
| * | | ACPI: add module autoloading support for ACPI enumerated devicesZhang Rui2014-01-162-0/+72
| * | | ACPI: fix create_modalias() return value handlingZhang Rui2014-01-161-6/+10
| |/ /
| | |
| \ \
*-. \ \ Merge branches 'acpi-init' and 'acpi-hotplug'Rafael J. Wysocki2014-01-173-1/+16
|\ \ \ \
| | * | | ACPI / memhotplug: add parameter to disable memory hotplugPrarit Bhargava2014-01-162-0/+15
| * | | | ACPI / init: Run acpi_early_init() before timekeeping_init()Lee, Chun-Yi2014-01-161-1/+1
| | |/ / | |/| |
* | | | Merge branch 'pm-clk'Rafael J. Wysocki2014-01-171-5/+25
|\ \ \ \
| * | | | PM / clock_ops: report clock errors from clk_enable()Ben Dooks2014-01-151-2/+17
| * | | | PM / clock_ops: check return of clk_enable() in pm_clk_resume()Ben Dooks2014-01-151-2/+4
| * | | | PM / clock_ops: fix up clk prepare/unprepare countBen Dooks2014-01-151-2/+5
| |/ / /
* | | | Merge branch 'pm-cpuidle'Rafael J. Wysocki2014-01-174-106/+22
|\ \ \ \
| * | | | intel_idle: remove superfluous dev->state_count initializationBartlomiej Zolnierkiewicz2014-01-111-29/+0
| * | | | intel_idle: do C1E promotion disable quirk for hotplugged CPUsBartlomiej Zolnierkiewicz2014-01-111-0/+3
| * | | | ACPI / cpuidle: remove dev->state_count settingBartlomiej Zolnierkiewicz2014-01-111-2/+0
| * | | | ACPI / cpuidle: fix max idle state handling with hotplug CPU supportBartlomiej Zolnierkiewicz2014-01-111-13/+14
| * | | | POWERPC: pseries: cpuidle: use the common cpuidle_[un]register() routinesBartlomiej Zolnierkiewicz2014-01-111-54/+3
| * | | | POWERPC: pseries: cpuidle: remove superfluous dev->state_count initializationBartlomiej Zolnierkiewicz2014-01-111-2/+0
| * | | | ARM: EXYNOS: cpuidle: fix AFTR mode checkBartlomiej Zolnierkiewicz2014-01-111-6/+2
| | | | |
| \ \ \ \
| \ \ \ \
| \ \ \ \
*---. \ \ \ \ Merge branches 'pm-sleep', 'pm-runtime' and 'pm-apm'Rafael J. Wysocki2014-01-126-11/+46
|\ \ \ \ \ \ \
| | | * \ \ \ \ Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jiko...Rafael J. Wysocki2014-01-112-2/+11
| | | |\ \ \ \ \
| | | | * | | | | apm-emulation: add hibernation APM events to support suspend2diskBin Shi2014-01-072-2/+11
| | * | | | | | | PM / Runtime: Implement the pm_generic_runtime functions for CONFIG_PMUlf Hansson2013-12-222-6/+10
| | * | | | | | | PM / Runtime: Add second macro for definition of runtime PM callbacksUlf Hansson2013-12-221-0/+9
| | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | PM / hibernate: Call platform_leave() in suspend path tooBjørn Mork2014-01-061-3/+3
| * | | | | | | Merge back earlier 'pm-sleep' material.Rafael J. Wysocki2013-12-30812-3982/+7596
| |\ \ \ \ \ \ \
| * | | | | | | | PM / Sleep: Add macro to define common late/early system PM callbacksUlf Hansson2013-12-221-0/+12
| * | | | | | | | PM / hibernate: export hibernation_set_opsLeonardo Potenza2013-11-301-0/+1
* | | | | | | | | Merge branch 'pnp'Rafael J. Wysocki2014-01-124-6/+20
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | PNPBIOS: check return value of pnp_add_device()Dmitry Torokhov2014-01-071-3/+9
| * | | | | | | | | PNP: Mark the function pnp_build_option() as static in resource.cRashika Kheria2014-01-061-1/+1
| * | | | | | | | | PNP / card: add missing put_device() callLevente Kurusa2014-01-051-0/+1
| * | | | | | | | | PNPACPI: check return value of pnp_add_device()Dmitry Torokhov2013-12-231-2/+9
| | |_|/ / / / / / | |/| | | | | | |
| | | | | | | | |
| \ \ \ \ \ \ \ \
| \ \ \ \ \ \ \ \
| \ \ \ \ \ \ \ \
| \ \ \ \ \ \ \ \
| \ \ \ \ \ \ \ \
| \ \ \ \ \ \ \ \
| \ \ \ \ \ \ \ \
*-------. \ \ \ \ \ \ \ \ Merge branches 'acpi-gpe', 'acpi-video', 'acpi-thermal', 'acpi-processor', 'a...Rafael J. Wysocki2014-01-127-36/+69
|\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | ACPI / sleep: remove panic in case hardware has changed after S4Oliver Neukum2014-01-111-5/+2
| | | | * | | | | | | | | | ACPI / scan: bail out early if failed to parse APIC ID for CPUJiang Liu2014-01-111-10/+14
| | | | |/ / / / / / / / /
| | | * / / / / / / / / / ACPI / thermal: remove const from thermal_zone_device_ops declarationEmil Goode2014-01-081-1/+1
| | | |/ / / / / / / / /
| | * | | | | | | | | | ACPI: Blacklist Win8 OSI for some HP laptop 2013 modelsTakashi Iwai2013-12-201-0/+50
| | * | | | | | | | | | ACPI / video: Fix typo in video_detect.cMasanari Iida2013-12-201-1/+1
| | | |/ / / / / / / / | | |/| | | | | | | |
| * | | | | | | | | | ACPI / EC: disable GPE before removing GPE handlerLan Tianyu2013-12-191-1/+1
| * | | | | | | | | | ACPI / Button: Fix enabling button GPEs twiceLan Tianyu2013-12-191-18/+0
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'acpi-dsm'Rafael J. Wysocki2014-01-129-664/+403
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | ACPI / extlog: replace open-coded _DSM code with helper functionsJiang Liu2014-01-051-49/+12