Skip to content
Commit 5e59b024 authored by Michael S. Tsirkin's avatar Michael S. Tsirkin
Browse files

Merge branch pci into master 

Merge master and pci branch, resolve build breakage in hw/esp.c
introduced by f90c2bcd.

Conflicts:
	hw/esp.c
parents 7162ab21 932d4a42
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment