diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-06-03 23:35:05 +0300 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-06-03 23:35:05 +0300 |
| commit | 60c07f80b04698f6c054b675cb67ec5e7ee8db27 (patch) | |
| tree | 3c038a613810db1f3f023e0cec09ed8679088a5d /arch/mips/include/asm/mach-loongson32/loongson1.h | |
| parent | 7f9bef9debafcb767d00efb177d0f2edd4940eab (diff) | |
| parent | 9f9cd7ee2c05881f151e5ee4889e667a031dd8d9 (diff) | |
| parent | 86314751c7945fa0c67f459beeda2e7c610ca429 (diff) | |
| download | linux-60c07f80b04698f6c054b675cb67ec5e7ee8db27.tar.xz | |
Merge branches 'acpica-fixes', 'acpi-video' and 'acpi-processor'
* acpica-fixes:
ACPICA / Hardware: Fix old register check in acpi_hw_get_access_bit_width()
* acpi-video:
ACPI / Thermal / video: fix max_level incorrect value
* acpi-processor:
ACPI / processor: Avoid reserving IO regions too early