9d0bfe1097
CVS conflict marker |
||
---|---|---|
.. | ||
acpica | ||
acpi_acad.c | ||
acpi_bat.c | ||
acpi_button.c | ||
acpi_ec.c | ||
acpi_ecreg.h | ||
acpi_lid.c | ||
acpi_osd.h | ||
acpi_resource.c | ||
acpi.c | ||
acpica.h | ||
acpireg.h | ||
acpivar.h | ||
files.acpi |
9d0bfe1097
CVS conflict marker |
||
---|---|---|
.. | ||
acpica | ||
acpi_acad.c | ||
acpi_bat.c | ||
acpi_button.c | ||
acpi_ec.c | ||
acpi_ecreg.h | ||
acpi_lid.c | ||
acpi_osd.h | ||
acpi_resource.c | ||
acpi.c | ||
acpica.h | ||
acpireg.h | ||
acpivar.h | ||
files.acpi |