diff options
| author | Ingo Molnar <[email protected]> | 2022-03-14 17:52:36 +0000 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2022-03-14 17:53:00 +0000 |
| commit | 411472ae5bb4ffe1404dc5f1505f07e0f04770a8 (patch) | |
| tree | 0ea009eb6011c7f093ba26d9af054a639ef4d401 /drivers/acpi/cppc_acpi.c | |
| parent | Merge tag 'irqchip-5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/maz... (diff) | |
| parent | Linux 5.17-rc8 (diff) | |
| download | kernel-411472ae5bb4ffe1404dc5f1505f07e0f04770a8.tar.gz kernel-411472ae5bb4ffe1404dc5f1505f07e0f04770a8.zip | |
Merge tag 'v5.17-rc8' into irq/core, to fix conflicts
Conflicts:
drivers/pinctrl/pinctrl-starfive.c
Signed-off-by: Ingo Molnar <[email protected]>
Diffstat (limited to 'drivers/acpi/cppc_acpi.c')
0 files changed, 0 insertions, 0 deletions