Merge remote branch 'origin/master' into pci

Conflicts: Makefile.objs hw/virtio.c
yakuizhao · Dec 1, 2010 · c924f36 · c924f36
2 parents 1abeb5a + 09fa35e
commit c924f36
Show file tree

Hide file tree

Showing 123 changed files with 2,980 additions and 1,195 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,8 @@ config-host.*
 config-target.*
 trace.h
 trace.c
+trace-dtrace.h
+trace-dtrace.dtrace
 *-timestamp
 *-softmmu
 *-darwin-user