Merge commit 'd8108fb187bb68459cfe7dca4b5c983db33bcc7b' into upstream-merge
commit6ecc9d4c1e375b15acc3cf3b0314ecce8548be74
authorAvi Kivity <avi@redhat.com>
Tue, 28 Jun 2011 12:04:09 +0000 (28 15:04 +0300)
committerAvi Kivity <avi@redhat.com>
Tue, 28 Jun 2011 12:04:09 +0000 (28 15:04 +0300)
treed3c1fd700e208e36e917cc65086f44b979128b78
parentf2604887b74feb9907d7b7b3237561bbde6736c8
parentd8108fb187bb68459cfe7dca4b5c983db33bcc7b
Merge commit 'd8108fb187bb68459cfe7dca4b5c983db33bcc7b' into upstream-merge

* commit 'd8108fb187bb68459cfe7dca4b5c983db33bcc7b':
  cpu-exec: unify do_interrupt call

Conflicts:
cpu-exec.c

Signed-off-by: Avi Kivity <avi@redhat.com>
cpu-exec.c