summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
Commit message (Expand)AuthorAgeFilesLines
*-. Merge branches 'acpi-scan' and 'acpi-ec'Rafael J. Wysocki2014-10-312-26/+75
|\ \
| | * ACPI / EC: Fix regression due to conflicting firmware behavior between Samsun...Lv Zheng2014-10-291-7/+18
| | * Revert "ACPI / EC: Add support to disallow QR_EC to be issued before completi...Lv Zheng2014-10-291-3/+3
| |/ |/|
| * ACPI: Use ACPI companion to match only the first physical deviceMika Westerberg2014-10-271-16/+54
|/
* Merge tag 'pm+acpi-3.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2014-10-2416-89/+215
|\
| *-. Merge branches 'acpi-pm' and 'pm-genirq'Rafael J. Wysocki2014-10-231-1/+1
| |\ \
| | * | ACPI: invoke acpi_device_wakeup() with correct parametersZhang Rui2014-10-231-1/+1
| | | |
| | \ \
| *-. \ \ Merge branches 'acpi-ec' and 'acpi-platform'Rafael J. Wysocki2014-10-232-38/+71
| |\ \ \ \
| | | * | | ACPI / platform: provide default DMA maskHeikki Krogerus2014-10-211-0/+2
| | | | |/ | | | |/|
| | * | | ACPI / EC: Cleanup coding style.Lv Zheng2014-10-211-26/+30
| | * | | ACPI / EC: Refine event/query debugging messages.Lv Zheng2014-10-211-6/+8
| | * | | ACPI / EC: Add detailed command/query debugging information.Lv Zheng2014-10-211-5/+29
| | * | | ACPI / EC: Enhance the logs to apply to QR_EC transactions.Lv Zheng2014-10-211-3/+3
| | * | | ACPI / EC: Add CPU ID to debugging messages.Lv Zheng2014-10-211-1/+2
| | |/ /
| * | | ACPICA: iASL/Disassembler: Add support for hardware summary mapfiles.Bob Moore2014-10-211-0/+34
| * | | ACPICA: Events: Reduce source code difference for the ACPI_EVENT_FLAG_HANDLE ...Lv Zheng2014-10-214-5/+5
| * | | ACPICA: Events: Reduce source code difference for the ACPI_EVENT_FLAG_HANDLE ...Lv Zheng2014-10-213-17/+33
| * | | ACPICA: Events: Update GPE handler removal, match behavior of handler install.Lv Zheng2014-10-211-3/+5
| * | | ACPICA: Events: Reduce source code difference in acpi_install_gpe_handler().Lv Zheng2014-10-211-1/+9
| * | | ACPICA: Events: Reduce indent divergences of events files.Lv Zheng2014-10-217-25/+25
| * | | ACPICA: acpidump: Add ACPI 1.0 RSDP support.Lv Zheng2014-10-212-1/+34
| |/ /
* | | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/l...Linus Torvalds2014-10-2410-94/+357
|\ \ \ | |/ / |/| |
| * | Thermal: int340x thermal: select ACPI fan driverZhang Rui2014-10-171-1/+1
| * | Thermal: move the KELVIN_TO_MILLICELSIUS macro to thermal.hAaron Lu2014-10-101-9/+9
| * | ACPI / Fan: support INT3404 thermal deviceAaron Lu2014-10-101-0/+1
| * | ACPI / Fan: add ACPI 4.0 style fan supportAaron Lu2014-10-101-27/+241
| * | ACPI / fan: convert to platform driverAaron Lu2014-10-101-34/+28
| * | ACPI / fan: use acpi_device_xxx_power instead of acpi_bus equivelantAaron Lu2014-10-103-7/+6
| * | ACPI / fan: remove no need check for device pointerAaron Lu2014-10-101-17/+1
| * | ACPI / fan: remove unused macroAaron Lu2014-10-101-4/+0
| * | Thermal: introduce int3400 thermal driverZhang Rui2014-10-101-1/+1
| * | ACPI: add ACPI_TYPE_LOCAL_REFERENCE support to acpi_extract_package()Zhang Rui2014-10-101-1/+27
| * | ACPI: make acpi_create_platform_device() an external APIZhang Rui2014-10-102-7/+1
| * | ACPI: introduce ACPI int340x thermal scan handlerZhang Rui2014-09-114-0/+54
* | | Merge tag 'pm+acpi-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2014-10-0917-451/+319
|\ \ \
| * \ \ Merge branch 'pm-domains'Rafael J. Wysocki2014-10-071-35/+36
| |\ \ \
| | * | | ACPI / PM: Convert acpi_dev_pm_detach() into a static functionUlf Hansson2014-09-221-35/+34
| | * | | ACPI / PM: Assign the ->detach() callback when attaching the PM domainUlf Hansson2014-09-221-0/+2
| * | | | Merge branch 'acpi-pm'Rafael J. Wysocki2014-10-072-1/+17
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | ACPI / sleep: Rework the handling of ACPI GPE wakeup from suspend-to-idleRafael J. Wysocki2014-09-302-1/+17
| | | | |
| | \ \ \
| | \ \ \
| | \ \ \
| | \ \ \
| | \ \ \
| *-----. \ \ \ Merge branches 'acpi-processor', 'acpi-battery', 'acpi-utils' and 'acpi-fan'Rafael J. Wysocki2014-10-074-15/+12
| |\ \ \ \ \ \ \
| | | | | * | | | ACPI / fan: printk replacementSudip Mukherjee2014-10-071-10/+8
| | | | * | | | | ACPI / utils: Update acpi_check_dsm() commentsYijing Wang2014-09-241-1/+0
| | | * | | | | | ACPI / battery: Replace strnicmp with strncasecmpRasmus Villemoes2014-09-241-1/+1
| | | |/ / / / /
| | * / / / / / ACPI / processor: use container_of instead of casting first structure memberFabian Frederick2014-09-241-3/+3
| | |/ / / / /
| | | | | | |
| | \ \ \ \ \
| *-. \ \ \ \ \ Merge branches 'acpi-pnp' and 'acpi-blacklist'Rafael J. Wysocki2014-10-052-6/+34
| |\ \ \ \ \ \ \
| | | * | | | | | ACPI / blacklist: add Win8 OSI quirks for some Dell laptop modelsEdward Lin2014-09-241-2/+34
| | | |/ / / / /
| | * | | | / / ACPI / PNP: remove Fujitsu device IDs from ACPI PNP ID listZhang Rui2014-09-091-4/+0
| | | |_|_|/ / | | |/| | | |
| * | | | | | Merge branch 'acpi-lpss'Rafael J. Wysocki2014-10-051-109/+58
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge back earlier 'acpi-lpss' material for v3.18.Rafael J. Wysocki2014-09-291-109/+58
| | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |