]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
Merge branches 'acpi-ac' and 'acpi-tpm'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sun, 5 Jan 2014 21:57:25 +0000 (22:57 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sun, 5 Jan 2014 21:57:25 +0000 (22:57 +0100)
* acpi-ac:
  ACPI / AC: change notification handler type to ACPI_ALL_NOTIFY

* acpi-tpm:
  ACPI / TPM: fix memory leak when walking ACPI namespace


Trivial merge