Merge remote-tracking branch 'qemu/master'
commit86a4fb82ad31f663063139dd43b4a7c4baaf805e
authorStefan Weil <sw@weilnetz.de>
Mon, 14 Mar 2016 21:24:31 +0000 (14 22:24 +0100)
committerStefan Weil <sw@weilnetz.de>
Mon, 14 Mar 2016 21:24:31 +0000 (14 22:24 +0100)
tree496c6cd238854003ae45eaed169f22a5f0280dd6
parent4012a4d655f1f366ed2b0db2cfd9e1b87d58504d
parent618a5a8bc52ba0f2ecbb3dffd01e657f4d841f75
Merge remote-tracking branch 'qemu/master'
MAINTAINERS
memory.c