diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-06-18 23:18:43 (GMT) |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-06-18 23:18:43 (GMT) |
| commit | a8269d36a880c016f202260420d9abe6ef061ace (patch) | |
| tree | b9dc0168b60b5058ce2d4200ff383334af7691c6 | |
| parent | b306976ef783188c2723ab2492fd3c0169bc8585 (diff) | |
| parent | fac69a2bc8278e209cd6e2ef3585f751cc034b00 (diff) | |
| parent | 47b98c74fab2d05fd724a6d9fd0efc8987ae3911 (diff) | |
| download | linux-a8269d36a880c016f202260420d9abe6ef061ace.tar.xz | |
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