Merge remote-tracking branch 'qemu/master'
commit9543275c05059eab23b13ee05eb5c21c7148cb96
authorStefan Weil <sw@weilnetz.de>
Tue, 8 Jul 2014 05:23:07 +0000 (8 07:23 +0200)
committerStefan Weil <sw@weilnetz.de>
Tue, 8 Jul 2014 05:23:07 +0000 (8 07:23 +0200)
treef2bf04c43b8c685840e19db2e81bf69669ce469d
parent5f97feebd2b49ed95150bc81ff492c2698cff3b4
parent128f0e66149afb2dfc325dfd183aac345f417763
Merge remote-tracking branch 'qemu/master'
hw/ppc/prep.c