]> 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)
commit4f30c5a530ec4290038ba5084b6aa0719c95278c
tree22ddee10e98f0e53b12e7ef641dfd4aa16d4e104
parent0b6fb5ffa0dc1b7e9716da3fadd522306bf773c0
parent350c72fbcb311d5ee817faf2a73d24517b270656
parent0f7adcb56e06d619ab549c9cd13c322d63f8bab2
parent8c8aa469abd1a01562aef201865a62ac01b94fc1
parent968034cea8ce0bb7223c359ea5220d5b008a423d
parent0a94a324c7c84ec48790bb1858cc03d9a46542cf
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