summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
Commit message (Expand)AuthorAgeFilesLines
*-. Merge branches 'acpi-ec' and 'acpi-processor'Rafael J. Wysocki2014-05-032-12/+16
|\ \
| | * ACPI / processor: Fix failure of loading acpi-cpufreq driverLan Tianyu2014-05-011-3/+4
| |/ |/|
| * ACPI / EC: Process rather than discard events in acpi_ec_clearKieran Clancy2014-04-291-9/+12
|/
*-. Merge branches 'pnp' and 'acpi-hotplug'Rafael J. Wysocki2014-04-261-3/+2
|\ \
| | * ACPI / notify: Do not block unknown type notifications in root handlerRafael J. Wysocki2014-04-241-3/+2
| |/
* / ACPICA: Fix buffer allocation issue for generic_serial_bus region accesses.Lv Zheng2014-04-211-7/+97
|/
* Merge branch 'acpi-config'Rafael J. Wysocki2014-04-081-2/+6
|\
| * ACPI: Update the ACPI spec information in KconfigHanjun Guo2014-04-081-2/+6
| |
| \
| \
| \
| \
| \
*-----. \ Merge branches 'acpi-cleanup', 'acpi-thermal', 'acpi-video' and 'acpi-dock'Rafael J. Wysocki2014-04-085-11/+11
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| | | | * ACPI / dock: Drop dock_device_ids[] tableRafael J. Wysocki2014-04-071-6/+0
| |_|_|/ |/| | |
| | | * ACPI / video: Favor native backlight interface for ThinkPad HelixStephen Chandler Paul2014-04-071-0/+8
| |_|/ |/| |
| | * ACPI / thermal: Fix wrong variable usage in debug statementZhihui Zhang2014-04-071-1/+1
| |/ |/|
| * ACPI: Clean up memory allocationsjhbird.choi@samsung.com2014-04-042-4/+2
|/
* Merge tag 'pm+acpi-3.15-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/g...Linus Torvalds2014-04-0216-148/+272
|\
| *-. Merge branches 'acpi-processor' and 'pnp'Rafael J. Wysocki2014-04-011-27/+0
| |\ \
| | * | Revert "ACPI / processor: Make it possible to get APIC ID via GIC"Hanjun Guo2014-03-261-27/+0
| * | | Merge branch 'acpica'Rafael J. Wysocki2014-04-0115-121/+272
| |\ \ \
| | * | | ACPICA: Enable auto-serialization as a default kernel behavior.Lv Zheng2014-03-262-7/+7
| | * | | ACPICA: Ignore sync_level for methods that have been auto-serialized.Bob Moore2014-03-262-6/+21
| | * | | ACPICA: Add additional named objects for the auto-serialize method scan.Lv Zheng2014-03-261-2/+4
| | * | | ACPICA: Add auto-serialization support for ill-behaved control methods.Bob Moore2014-03-2611-25/+243
| | * | | ACPICA: Remove global option to serialize all control methods.Lv Zheng2014-03-265-100/+16
* | | | | Merge tag 'pci-v3.15-changes' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2014-04-011-8/+8
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | ACPI / numa: Use __weak, not the gcc-specific versionBjorn Helgaas2014-02-031-1/+1
| * | | | ACPI / numa: Make __acpi_map_pxm_to_node(), acpi_get_pxm() staticBjorn Helgaas2014-02-031-2/+2
| * | | | ACPI / numa: Simplify acpi_get_node() styleBjorn Helgaas2014-02-031-4/+4
| * | | | ACPI / numa: Fix acpi_get_node() prototypeBjorn Helgaas2014-02-031-1/+1
* | | | | Merge branch 'acpi-processor'Rafael J. Wysocki2014-03-211-21/+57
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge back earlier 'acpi-processor' material.Rafael J. Wysocki2014-02-271-21/+57
| |\ \ \ \
| | * | | | ACPI / processor: Make it possible to get APIC ID via GICHanjun Guo2014-02-191-0/+27
| | * | | | ACPI / processor: Build idle_boot_override on x86 and ia64Hanjun Guo2014-02-191-19/+28
| | * | | | ACPI / processor: Use ACPI_PROCESSOR_DEVICE_HID instead of "ACPI0007"Hanjun Guo2014-02-191-1/+1
| | * | | | ACPI / processor: Fix acpi_processor_eval_pdc() return value typeHanjun Guo2014-02-191-1/+1
| | | | | |
| \ \ \ \ \
*-. \ \ \ \ \ Merge branches 'pm-runtime' and 'pm-sleep'Rafael J. Wysocki2014-03-201-3/+38
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | ACPI / PM: Resume runtime-suspended devices later during system suspendRafael J. Wysocki2014-03-041-3/+38
| | | |/ / / | | |/| | |
| | | | | |
| \ \ \ \ \
| \ \ \ \ \
| \ \ \ \ \
*---. \ \ \ \ \ Merge branches 'pm-qos', 'pm-domains' and 'pm-drivers'Rafael J. Wysocki2014-03-203-5/+87
|\ \ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| * | | | | | | ACPI / LPSS: Support for device latency tolerance PM QoSRafael J. Wysocki2014-02-111-1/+70
| * | | | | | | ACPI / scan: Add bind/unbind callbacks to struct acpi_scan_handlerRafael J. Wysocki2014-02-112-4/+17
* | | | | | | | Merge branch 'acpica'Rafael J. Wysocki2014-03-20170-491/+770
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | ACPICA: Revert "Headers: Deploy #pragma pack (push) and (pop)."Robert Moore2014-03-1818-70/+1
| * | | | | | | Merge branch 'acpi-config' into acpicaRafael J. Wysocki2014-03-182-14/+14
| |\ \ \ \ \ \ \
| * | | | | | | | ACPICA: Prevent infinite loops when traversing corrupted lists.Bob Moore2014-03-183-4/+32
| * | | | | | | | ACPICA: Debugger: Add missing objects; Traverse linked listsBob Moore2014-03-182-34/+199
| * | | | | | | | ACPICA: Add text: ACPICA policy for new _OSI strings. No functional change.Bob Moore2014-03-181-0/+25
| * | | | | | | | ACPICA: Update for _PRP predefined name.Bob Moore2014-03-181-1/+1
| * | | | | | | | ACPICA: Cleanup/improve global variable declarations.Lv Zheng2014-03-182-201/+189
| * | | | | | | | ACPICA: Comment update - no functional change.Bob Moore2014-03-186-37/+37
| * | | | | | | | ACPICA: Do not abort _PRT repair on a single subpackage failure.Bob Moore2014-02-271-8/+9
| * | | | | | | | ACPICA: Harden _PRT repair code; check for minimum package length.Bob Moore2014-02-271-1/+7
| * | | | | | | | ACPICA: Restore code that repairs NULL package elements in return values.Lv Zheng2014-02-271-4/+21