Merge remote branch 'origin/master' into pci

Conflicts:
	exec.c

1 files changed, 0 insertions, 1 deletions

diff --git a/net/vde.c b/net/vde.c
index 0b46fa6405..ac48ab2f0a 100644
--- a/net/vde.c
+++ b/net/vde.c
@@ -31,7 +31,6 @@
 #include "qemu-char.h"
 #include "qemu-common.h"
 #include "qemu-option.h"
-#include "sysemu.h"
 
 typedef struct VDEState {
     VLANClientState nc;