acc95bc850
Resolve conflicts around apb. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> |
||
---|---|---|
.. | ||
Makefile.objs | ||
smbios_build.h | ||
smbios_type_38-stub.c | ||
smbios_type_38.c | ||
smbios-stub.c | ||
smbios.c |
acc95bc850
Resolve conflicts around apb. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> |
||
---|---|---|
.. | ||
Makefile.objs | ||
smbios_build.h | ||
smbios_type_38-stub.c | ||
smbios_type_38.c | ||
smbios-stub.c | ||
smbios.c |