Merge commit 'e7701825e17d74913b0f1585d523cedaf1d6632a' into upstream-merge
commit250968666b4984f5f6e91bd3358f21187aea8ad8
authorMarcelo Tosatti <mtosatti@redhat.com>
Wed, 20 Oct 2010 23:16:24 +0000 (20 21:16 -0200)
committerMarcelo Tosatti <mtosatti@redhat.com>
Wed, 20 Oct 2010 23:16:24 +0000 (20 21:16 -0200)
tree66bc69967689934c198e3d5492c1cfb372c168ac
parentb4f09f67956e74367d3ba35137985bb9fc314842
parente7701825e17d74913b0f1585d523cedaf1d6632a
Merge commit 'e7701825e17d74913b0f1585d523cedaf1d6632a' into upstream-merge

* commit 'e7701825e17d74913b0f1585d523cedaf1d6632a':
  kvm: x86: add mce support
  iothread: use signalfd
  signalfd compatibility

Conflicts:
target-i386/kvm.c

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Makefile.objs
cpus.c
qemu-kvm-x86.c
qemu-kvm.c
qemu-kvm.h
target-i386/helper.c
target-i386/kvm.c