Merge commit '3d39c9593314946258bb334737aa7a4d113731d8' into upstream-merge
commit9e0829080fcb89b1de890513bc5519a87f5c507a
authorMarcelo Tosatti <mtosatti@redhat.com>
Wed, 22 Jun 2011 23:39:42 +0000 (22 20:39 -0300)
committerMarcelo Tosatti <mtosatti@redhat.com>
Wed, 22 Jun 2011 23:39:42 +0000 (22 20:39 -0300)
treedb8253c6831946200a81c071bf5c8155d9eee658
parent2f6798da558f0f4a4f4ec9685938154d86709429
parent3d39c9593314946258bb334737aa7a4d113731d8
Merge commit '3d39c9593314946258bb334737aa7a4d113731d8' into upstream-merge

* commit '3d39c9593314946258bb334737aa7a4d113731d8':
  Remove unneeded kvm.h from cpu-exec.c

Conflicts:
cpu-exec.c

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
cpu-exec.c