]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branches 'pnp' and 'acpi-cppc'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 5 Feb 2016 23:33:52 +0000 (00:33 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 5 Feb 2016 23:33:52 +0000 (00:33 +0100)
* pnp:
  PNP: Add Haswell-ULT to Intel MCH size workaround

* acpi-cppc:
  ACPI / CPPC: remove redundant mbox_send_message() declaration


Trivial merge