mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-23 04:34:11 +08:00
73f0533049
Conflicts: drivers/acpi/apei/apei-base.c This was a conflict between |
||
---|---|---|
.. | ||
apei-base.c | ||
apei-internal.h | ||
cper.c | ||
einj.c | ||
erst-dbg.c | ||
erst.c | ||
ghes.c | ||
hest.c | ||
Kconfig | ||
Makefile |