Merge remote-tracking branch 'qemu/master'
commitf0cfe7f8bff0834519b9b4ca20b0b105128a8af0
authorStefan Weil <sw@weilnetz.de>
Tue, 14 Jan 2014 05:08:48 +0000 (14 06:08 +0100)
committerStefan Weil <sw@weilnetz.de>
Tue, 14 Jan 2014 05:08:48 +0000 (14 06:08 +0100)
tree25e80d210caf9ceb2be08ee05626df07931f75ef
parent9a29b2b83b1455e44c7ab787eddc73113ab1132e
parent133fe77437d3a23bf1fd70a231b4f29d5fa0571c
Merge remote-tracking branch 'qemu/master'
block/raw-win32.c
qemu-img.c
qom/object.c
target-arm/cpu.c
target-i386/cpu.c
util/qemu-option.c
vl.c