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

Merge remote branch 'origin/master' into pci 

Conflicts:
	Makefile.objs
	hw/virtio.c
parents 1abeb5a6 09fa35e5
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment