summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/pci_root.c
diff options
context:
space:
mode:
authorRafael J. Wysocki2014-03-20 13:20:47 +0100
committerRafael J. Wysocki2014-03-20 13:20:47 +0100
commite25c5abf4125526d62417f8b5a314e743eefe900 (patch)
tree22ddee10e98f0e53b12e7ef641dfd4aa16d4e104 /drivers/acpi/pci_root.c
parentMerge branch 'acpi-fan' (diff)
parentACPI: Remove duplicate definitions of PREFIX (diff)
parentACPI / thermal: make acpi_thermal_check asynchronous on resume (diff)
parentACPI / PCI: Do not call ISA-specific code if ISA is not supported (diff)
parentACPI / LPSS: Add Intel BayTrail ACPI mode PWM (diff)
parentACPI / button: Add ACPI Button event via netlink routine (diff)
downloadkernel-qcow2-linux-e25c5abf4125526d62417f8b5a314e743eefe900.tar.gz
kernel-qcow2-linux-e25c5abf4125526d62417f8b5a314e743eefe900.tar.xz
kernel-qcow2-linux-e25c5abf4125526d62417f8b5a314e743eefe900.zip
Merge branches 'acpi-cleanup', 'acpi-thermal', 'acpi-pci', 'acpi-lpss' and 'acpi-button'
* acpi-cleanup: ACPI: Remove duplicate definitions of PREFIX ACPI / tables: Replace printk with pr_* * acpi-thermal: ACPI / thermal: make acpi_thermal_check asynchronous on resume * acpi-pci: ACPI / PCI: Do not call ISA-specific code if ISA is not supported * acpi-lpss: ACPI / LPSS: Add Intel BayTrail ACPI mode PWM * acpi-button: ACPI / button: Add ACPI Button event via netlink routine