From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu, 18 Jun 2015 23:18:43 +0000 (+0200)
Subject: Merge branches 'pnp' and 'pm-tools'
X-Git-Tag: v4.2-rc1~150^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a8269d36a880c016f202260420d9abe6ef061ace;p=thirdparty%2Fkernel%2Flinux.git

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
---

a8269d36a880c016f202260420d9abe6ef061ace