Merge commit '632cf034b401cdd01dae253a8b577fe518e37654' into upstream-merge
commit7a45b89ada8d9a0a7bdc60a343cb656a33b59334
authorAvi Kivity <avi@redhat.com>
Sun, 20 Dec 2009 15:13:25 +0000 (20 17:13 +0200)
committerAvi Kivity <avi@redhat.com>
Sun, 20 Dec 2009 15:14:01 +0000 (20 17:14 +0200)
tree926e0930f8a08e749c706c698d70d3bd2a400a74
parent24054cc57ff97e37ebdd99fd5ecd07d422dd28cd
parent632cf034b401cdd01dae253a8b577fe518e37654
Merge commit '632cf034b401cdd01dae253a8b577fe518e37654' into upstream-merge

* commit '632cf034b401cdd01dae253a8b577fe518e37654':
  roms: remove option rom packing logic

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