]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit2edbf673c6e99fa2f5711f297b23ce766cc7b1d8
treeb9dc0168b60b5058ce2d4200ff383334af7691c6
parentd0eed999dd6db5295dacf59a63b52495b589fdd7
parente21503d2a66846efc2d3f3e5d55dea65d00d0e05
parent9e3776fc4c8e6768d5427ddb409d068376d84eda
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