summaryrefslogtreecommitdiffstats
path: root/drivers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'acpi-modules'Rafael J. Wysocki2014-01-175-7/+106
|\
| * platform: introduce OF style 'modalias' support for platform busZhang Rui2014-01-172-0/+7
| * ACPI: fix module autoloading for ACPI enumerated devicesZhang Rui2014-01-163-1/+32
| * ACPI: add module autoloading support for ACPI enumerated devicesZhang Rui2014-01-161-0/+57
| * ACPI: fix create_modalias() return value handlingZhang Rui2014-01-161-6/+10
| |
| \
*-. \ Merge branches 'acpi-init' and 'acpi-hotplug'Rafael J. Wysocki2014-01-171-0/+12
|\ \ \ | | |/ | |/|
| | * ACPI / memhotplug: add parameter to disable memory hotplugPrarit Bhargava2014-01-161-0/+12
* | | 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-172-44/+17
|\ \ \
| * | | 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
| | | |
| \ \ \
| \ \ \
| \ \ \
*---. \ \ \ Merge branches 'pm-sleep', 'pm-runtime' and 'pm-apm'Rafael J. Wysocki2014-01-122-4/+11
|\ \ \ \ \ \
| | | * \ \ \ Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jiko...Rafael J. Wysocki2014-01-111-2/+9
| | | |\ \ \ \
| | | | * | | | apm-emulation: add hibernation APM events to support suspend2diskBin Shi2014-01-071-2/+9
| | * | | | | | PM / Runtime: Implement the pm_generic_runtime functions for CONFIG_PMUlf Hansson2013-12-221-2/+2
| |/ / / / / /
* | | | | | | 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-128-664/+377
|\ \ \ \ \ \ \ \
| * | | | | | | | ACPI / extlog: replace open-coded _DSM code with helper functionsJiang Liu2014-01-051-49/+12
| * | | | | | | | ACPI / nouveau: replace open-coded _DSM code with helper functionsJiang Liu2014-01-052-130/+54
| * | | | | | | | nouveau / ACPI: fix memory leak in ACPI _DSM related codeJiang Liu2014-01-051-1/+4
| * | | | | | | | ACPI / i915: replace open-coded _DSM code with helper functionsJiang Liu2014-01-051-114/+30
| * | | | | | | | ACPI / i2c-hid: replace open-coded _DSM code with helper functionsJiang Liu2014-01-051-20/+6
| * | | | | | | | ACPI / TPM: detect PPI features by checking availability of _DSM functionsJiang Liu2014-01-051-26/+19
| * | | | | | | | ACPI / TPM: replace open-coded _DSM code with helper functionsJiang Liu2014-01-051-259/+145
| * | | | | | | | ACPI / TPM: match node name instead of full path when searching for TPM deviceJiang Liu2014-01-051-1/+1
| * | | | | | | | PCI / pci-label: treat PCI label with index 0 as valid labelJiang Liu2014-01-051-16/+18
| * | | | | | | | ACPI / PCI: replace open-coded _DSM code with helper functionsJiang Liu2014-01-051-87/+34
| * | | | | | | | PCI / pci-label: release allocated ACPI object on error recovery pathJiang Liu2014-01-051-8/+4
| * | | | | | | | ACPI: introduce helper interfaces for _DSM methodJiang Liu2014-01-051-0/+97
* | | | | | | | | Merge branch 'acpica'Rafael J. Wysocki2014-01-1220-315/+478
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | ACPICA: Utilities: Cleanup declarations of the acpi_gbl_debug_file global.Lv Zheng2014-01-081-0/+12
| * | | | | | | | | ACPICA: Linuxize: Cleanup spaces after special macro invocations.Lv Zheng2014-01-083-8/+2
| * | | | | | | | | ACPICA: Interpreter: Add additional debug info for an error case.Bob Moore2014-01-081-1/+2