Merge remote-tracking branch 'qemu/master'
commit50c0ff793b3199df76cea8d5f9ee600f793ae9d5
authorStefan Weil <sw@weilnetz.de>
Mon, 10 Nov 2014 20:51:36 +0000 (10 21:51 +0100)
committerStefan Weil <sw@weilnetz.de>
Mon, 10 Nov 2014 20:51:36 +0000 (10 21:51 +0100)
tree1759c4dc2426497628462db6b40b685eb47ac4e8
parentc5d1d900f0062eb017e33a390148d63236bc5c99
parent558c2c8ddfb165a36eb95dc93125c04829d68aa7
Merge remote-tracking branch 'qemu/master'
default-configs/mips-softmmu.mak
default-configs/mipsel-softmmu.mak
qemu-img.c
target-mips/cpu.h