]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branches 'acpi-cleanup', 'acpi-thermal', 'acpi-pci', 'acpi-lpss' and 'acpi...
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)
commit748d70e045b65ed20b74326b8af5b5af5eb23f15
tree22ddee10e98f0e53b12e7ef641dfd4aa16d4e104
parent8659b8ba9cc24a757f90426ee95672cd9441f0f2
parentc08b825d3c28bd939c1705868478980807e2361e
parente5380193790f03b0ffc6347411fd21a57251eb65
parent97be148987c9c4a99e04afe2aec4d472362dd408
parent23038bc30462f2c8149e36eafc3e222d8647c3e5
parentdd695fcab527ef487eae9066ea53a23b3b2b0e24
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
drivers/acpi/container.c
drivers/acpi/dock.c
drivers/acpi/osl.c
drivers/acpi/pci_root.c