diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2021-06-29 15:48:08 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2021-06-29 15:48:08 +0200 |
| commit | 3a616ec7977b3576caf8214cf92cac646f41cd55 (patch) | |
| tree | 369a75467dddda7ced5b661af9fe5f371a3b900b /arch/x86 | |
| parent | 2f4edfadbcb2b50b47b4b6cfbe943db9c3262bc0 (diff) | |
| parent | d7a188bb87d8da78a1ef0dea53f1639f3daf0790 (diff) | |
| parent | df35ee70864111c20ecb36745ffc5f821301d0e7 (diff) | |
| parent | 14fad24d0520c65ecfc2eebe8e4cf25ca02f19cf (diff) | |
| download | linux-3a616ec7977b3576caf8214cf92cac646f41cd55.tar.bz2 | |
Merge branches 'acpi-prm', 'acpi-sysfs' and 'acpi-x86'
* acpi-prm:
ACPI: PRM: make symbol 'prm_module_list' static
ACPI: Add \_SB._OSC bit for PRM
ACPI: PRM: implement OperationRegion handler for the PlatformRtMechanism subtype
* acpi-sysfs:
ACPI: sysfs: Remove tailing return statement in void function
ACPI: sysfs: Use __ATTR_RO() and __ATTR_RW() macros
ACPI: sysfs: Sort headers alphabetically
ACPI: sysfs: Refactor param_get_trace_state() to drop dead code
ACPI: sysfs: Unify pattern of memory allocations
ACPI: sysfs: Allow bitmap list to be supplied to acpi_mask_gpe
ACPI: sysfs: Make sparse happy about address space in use
ACPI: sysfs: fix doc warnings in device_sysfs.c
ACPI: sysfs: Drop four redundant return statements
ACPI: sysfs: Fix a buffer overrun problem with description_show()
* acpi-x86:
x86/acpi: Switch to pr_xxx log functions