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)
commitc8d150761ca6d1266cbcdc1a64529759b5b6068e
treef850aa5b9d02e4581ada37685d1cec648d8832e0
parent50a2bc5429f07ec4d53df2d287b03bdbceb281bb
parentdf45c712d1f4ef37714245fb75de726f4ca2bf8d
Merge branches 'acpi-ac' and 'acpi-tpm'

* acpi-ac:
  ACPI / AC: change notification handler type to ACPI_ALL_NOTIFY

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