Merge branches 'pnp' and 'pm-tools'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 18 Jun 2015 23:18:43 +0000 (01:18 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 18 Jun 2015 23:18:43 +0000 (01:18 +0200)
commita8269d36a880c016f202260420d9abe6ef061ace
treeb9dc0168b60b5058ce2d4200ff383334af7691c6
parentb306976ef783188c2723ab2492fd3c0169bc8585
parentfac69a2bc8278e209cd6e2ef3585f751cc034b00
parent47b98c74fab2d05fd724a6d9fd0efc8987ae3911
Merge branches 'pnp' and 'pm-tools'

* pnp:
  PNP / ACPI: use unsigned int in pnpacpi_encode_resources()
  PNP / ACPI: use u8 instead of int in acpi_resource_extended_irq context

* pm-tools:
  cpupower: mperf monitor: fix output in MAX_FREQ_SYSFS mode