]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c730d30 07070e1 a59ffb2 c1aaae6 e1c7481 0bf6368)
Merge branches 'acpi-cleanup', 'acpi-thermal', 'acpi-pci', 'acpi-lpss' and 'acpi-button'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 20 Mar 2014 12:20:47 +0000 (13:20 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 20 Mar 2014 12:20:47 +0000 (13:20 +0100)
* 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

1  2  3  4  5  6 
drivers/acpi/container.c patch | diff1 | diff2 | diff3 | diff4 | diff5 | diff6 | blob | history
drivers/acpi/dock.c patch | diff1 | diff2 | diff3 | diff4 | diff5 | diff6 | blob | history
drivers/acpi/osl.c patch | diff1 | diff2 | diff3 | diff4 | diff5 | diff6 | blob | history
drivers/acpi/pci_root.c patch | diff1 | diff2 | diff3 | diff4 | diff5 | diff6 | blob | history

diff --cc drivers/acpi/container.c
Simple merge
diff --cc drivers/acpi/dock.c
Simple merge
diff --cc drivers/acpi/osl.c
Simple merge
diff --cc drivers/acpi/pci_root.c
Simple merge
local clone of linux.git