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