summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'x86-ras-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2014-01-205-38/+83
|\
| * Merge tag 'ras_for_3.14_p2' of git://git.kernel.org/pub/scm/linux/kernel/git/...Ingo Molnar2014-01-124-31/+33
| |\
| | * ACPI, APEI, GHES: Cleanup ghes memory error handlingChen, Gong2013-12-211-16/+20
| | * ACPI, APEI: Cleanup alignment-aware accessesChen, Gong2013-12-213-13/+12Star
| | * ACPI, APEI, GHES: Do not report only correctable errors with SCIChen, Gong2013-12-211-2/+1Star
| * | Merge tag 'v3.13-rc8' into x86/ras, to pick up fixes.Ingo Molnar2014-01-127-5/+35
| |\ \
| * \ \ Merge tag 'please-pull-einj' of git://git.kernel.org/pub/scm/linux/kernel/git...Ingo Molnar2013-12-181-5/+34
| |\ \ \ | | |_|/ | |/| |
| | * | ACPI, APEI, EINJ: Changes to the ACPI/APEI/EINJ debugfs interfaceLuck, Tony2013-12-181-5/+34
| * | | ACPI, eMCA: Combine eMCA/EDAC event reporting priorityChen, Gong2013-12-111-2/+16
| |/ /
* | | Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2014-01-202-19/+1Star
|\ \ \
| * \ \ Merge branch 'x86/idle' into sched/coreIngo Molnar2014-01-132-19/+1Star
| |\ \ \ | | |_|/ | |/| |
| | * | x86, acpi, idle: Restructure the mwait idle routinesPeter Zijlstra2013-12-192-19/+1Star
| | |/
* | / Revert "ACPI: Add BayTrail SoC GPIO and LPSS ACPI IDs"Rafael J. Wysocki2014-01-181-1/+0Star
|/ /
| |
| \
*-. \ Merge branches 'acpi-battery' and 'pm-cpufreq'Rafael J. Wysocki2014-01-061-1/+21
|\ \ \
| * | | ACPI / Battery: Add a _BIX quirk for NEC LZ750/LSLan Tianyu2014-01-061-1/+21
| |/ /
* / / ACPI / AC: change notification handler type to ACPI_ALL_NOTIFYAlexander Mezin2014-01-051-2/+2
|/ /
| |
| \
*-. \ Merge branches 'acpi-pci-pm' and 'acpi-pci-hotplug'Rafael J. Wysocki2013-12-311-0/+10
|\ \ \
| | * | ACPIPHP / radeon / nouveau: Fix VGA switcheroo problem related to hotplugRafael J. Wysocki2013-12-311-0/+10
* | | | Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ker...Linus Torvalds2013-12-292-2/+0Star
|\ \ \ \
| * | | | x86/efi: Don't select EFI from certain special ACPI driversJan Beulich2013-12-192-2/+0Star
| | |_|/ | |/| |
| | | |
| \ \ \
*-. \ \ \ Merge branches 'powercap' and 'acpi-lpss' with new device IDsRafael J. Wysocki2013-12-271-0/+1
|\ \ \ \ \ | | |/ / / | |/| / / | |_|/ / |/| | |
| | * | ACPI: Add BayTrail SoC GPIO and LPSS ACPI IDsPaul Drews2013-11-301-0/+1
| | |/
* | / pstore: Don't allow high traffic options on fragile devicesLuck, Tony2013-12-201-0/+1
|/ /
* | Merge branch 'acpica'Rafael J. Wysocki2013-11-278-45/+76
|\ \
| * | ACPI: Clean up incorrect inclusions of ACPICA headersLv Zheng2013-11-261-1/+0Star
| * | ACPICA: Add support to delete all objects attached to the root namespace node.Bob Moore2013-11-212-8/+16
| * | ACPICA: Delete all attached data objects during namespace node deletion.Tomasz Nowicki2013-11-211-4/+8
| * | ACPICA: Resources: Fix loop termination for the get AML length function.Lv Zheng2013-11-214-25/+28
| * | ACPICA: Debug output: Do not emit function nesting level for kernel build.Bob Moore2013-11-211-7/+24
| | |
| \ \
| \ \
| \ \
*---. \ \ Merge branches 'acpi-hotplug', 'acpi-sysfs' and 'acpi-sleep'Rafael J. Wysocki2013-11-254-28/+33
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| | | * | ACPI / sleep: clean up compiler warning about uninitialized fieldAl Stone2013-11-211-1/+1
| |_|/ / |/| | |
| | * | ACPI / sysfs: Fix incorrect ACPI tables walk in acpi_tables_sysfs_init()Jeremy Compostella2013-11-211-25/+27
| | * | ACPI / sysfs: Set file size for each exposed ACPI tableDaisuke HATAYAMA2013-11-211-1/+1
| |/ / |/| |
| * | ACPI / hotplug: Fix conflicted PCI bridge notify handlersToshi Kani2013-11-202-1/+4
* | | Merge tag 'pm+acpi-2-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/g...Linus Torvalds2013-11-2011-174/+70Star
|\ \ \
| * \ \ Merge branch 'acpi-video'Rafael J. Wysocki2013-11-191-75/+12Star
| |\ \ \
| | * | | ACPI / video: clean up DMI table for initial black screen problemAaron Lu2013-11-151-75/+12Star
| * | | | Merge branch 'acpi-ec'Rafael J. Wysocki2013-11-191-1/+2
| |\ \ \ \
| | * | | | ACPI / EC: Ensure lock is acquired before accessing ec struct membersPuneet Kumar2013-11-151-1/+2
| * | | | | Merge branch 'acpi-hotplug'Rafael J. Wysocki2013-11-192-10/+5Star
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | ACPI / scan: Set flags.match_driver in acpi_bus_scan_fixed()Rafael J. Wysocki2013-11-191-0/+2
| | * | | | ACPI / PCI root: Clear driver_data before failing enumerationRafael J. Wysocki2013-11-191-0/+1
| | * | | | ACPI / hotplug: Fix PCI host bridge hot removalRafael J. Wysocki2013-11-191-8/+1Star
| | * | | | ACPI / hotplug: Fix acpi_bus_get_device() return value checkRafael J. Wysocki2013-11-191-2/+1Star
| * | | | | Merge branch 'acpi-lpss'Rafael J. Wysocki2013-11-161-0/+9
| |\ \ \ \ \
| | * | | | | ACPI / LPSS: add ACPI IDs for newer Intel PCHsMika Westerberg2013-11-121-0/+9
| | | |/ / / | | |/| | |
| * | | | | Merge branch 'acpi-config'Rafael J. Wysocki2013-11-162-46/+0Star
| |\ \ \ \ \
| | * | | | | ACPI: delete CONFIG_ACPI_BLACKLIST_YEARLen Brown2013-11-122-46/+0Star
| | |/ / / /
| * | | | | ACPI / AC: Remove struct acpi_device pointer from struct acpi_acLan Tianyu2013-11-141-7/+8
| * | | | | ACPI / bind: Use (put|get)_device() on ACPI device objects tooRafael J. Wysocki2013-11-141-1/+5