« Previous | Next » 

Revision c924f36a

IDc924f36a300cbc54d3cb511116e8e2bae17f5ae6

Added by Michael S. Tsirkin over 10 years ago

Merge remote branch 'origin/master' into pci

Conflicts:
Makefile.objs
hw/virtio.c

Files

  • added
  • modified
  • copied
  • renamed
  • deleted