Merge commit '5d17c0d2df4998598e6002b27b8e47e792899a0f' into queues/qemu-merge
commit17ee47418e65b1593defb30edbab33ccd47fc1f8
authorJan Kiszka <jan.kiszka@siemens.com>
Tue, 10 Apr 2012 14:26:23 +0000 (10 16:26 +0200)
committerJan Kiszka <jan.kiszka@siemens.com>
Tue, 10 Apr 2012 14:26:23 +0000 (10 16:26 +0200)
treeab8a6715066894c5dfd91526e57c0591d7e3a6a4
parent13b0496920bd9ae118450e5c45b82ab038daa603
parent5d17c0d2df4998598e6002b27b8e47e792899a0f
Merge commit '5d17c0d2df4998598e6002b27b8e47e792899a0f' into queues/qemu-merge

Conflicts:
hw/pc.c
Makefile.target
hw/i8254.h
hw/pc.c