Merge commit '3fbc1c0c1309a6cc2a0699fbf5e286d32250a0be' into queues/qemu-merge
commit4943d6e4698146b3e54f4cae015591348df8ad9f
authorJan Kiszka <jan.kiszka@siemens.com>
Tue, 10 Apr 2012 14:18:37 +0000 (10 16:18 +0200)
committerJan Kiszka <jan.kiszka@siemens.com>
Tue, 10 Apr 2012 14:18:37 +0000 (10 16:18 +0200)
tree7730c4bdcff996ac2deffe6229aa392af5e3e210
parenteafa61842ce782a87cbd6eb7becfafeea3d0fdcb
parent3fbc1c0c1309a6cc2a0699fbf5e286d32250a0be
Merge commit '3fbc1c0c1309a6cc2a0699fbf5e286d32250a0be' into queues/qemu-merge
hw/i8254.c
hw/i8254_common.c