Merge commit 'b8d6f53986c56dfcffe1961cb01877e81d0f8bb5' into upstream-merge
commit39b38c8b8f3f39cdb585c9c40089e6dfe93f8c3e
authorAvi Kivity <avi@redhat.com>
Sun, 16 May 2010 12:49:27 +0000 (16 15:49 +0300)
committerAvi Kivity <avi@redhat.com>
Sun, 16 May 2010 12:49:27 +0000 (16 15:49 +0300)
treeac7593927003421d3d5a952617c619a05a9238aa
parent65e807fdc71fee035002dea56215757d0b4836ef
parentb8d6f53986c56dfcffe1961cb01877e81d0f8bb5
Merge commit 'b8d6f53986c56dfcffe1961cb01877e81d0f8bb5' into upstream-merge

* commit 'b8d6f53986c56dfcffe1961cb01877e81d0f8bb5':
  pc: initialize ioapic before use.

Conflicts:
hw/pc.c

Signed-off-by: Avi Kivity <avi@redhat.com>
hw/pc.c