Merge remote-tracking branch 'qemu/master'
commit2afa237dc649ca1a215e9a615b875ef32dab9810
authorStefan Weil <sw@weilnetz.de>
Thu, 3 Mar 2016 19:57:16 +0000 (3 20:57 +0100)
committerStefan Weil <sw@weilnetz.de>
Thu, 3 Mar 2016 19:57:16 +0000 (3 20:57 +0100)
tree4b37f6df1c08a4992af574802d895e3b099a7228
parent5376efe9e582d226b7fabec04f75c5bca69720b5
parent2d3b7c0164e1b9287304bc70dd6ed071ba3e8dfc
Merge remote-tracking branch 'qemu/master'
MAINTAINERS