Merge commit 'd3d3bef0a03adfe73216d741d355bb12f6e52b33' into upstream-merge
commitf783377e8015fd06e37959fa55a82b9245ac10ea
authorMarcelo Tosatti <mtosatti@redhat.com>
Tue, 12 Jun 2012 21:47:17 +0000 (12 18:47 -0300)
committerMarcelo Tosatti <mtosatti@redhat.com>
Tue, 12 Jun 2012 21:47:17 +0000 (12 18:47 -0300)
tree3d19ff948b950984b55547bae16d25246398399e
parent101c205c03dc8c23bf7cdec339fd30a64ab4b7b8
parentd3d3bef0a03adfe73216d741d355bb12f6e52b33
Merge commit 'd3d3bef0a03adfe73216d741d355bb12f6e52b33' into upstream-merge

* commit 'd3d3bef0a03adfe73216d741d355bb12f6e52b33':
  kvm: Fix build for non-CAP_IRQ_ROUTING targets

Conflicts:
kvm-all.c

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
kvm-all.c