Merge branch 'master' of git://git.qemu.org/qemu into x86-next
commit0b6e9aa89e02c8b213af019aad816e00ba8243f8
authorEduardo Habkost <ehabkost@redhat.com>
Mon, 25 Jun 2018 17:10:56 +0000 (25 14:10 -0300)
committerEduardo Habkost <ehabkost@redhat.com>
Mon, 25 Jun 2018 17:10:56 +0000 (25 14:10 -0300)
tree27eb6832830ebf44939c7b968df9044c6d4433ae
parent6b2942f966d5e54c37d305c80f5f98d504c2bc55
parent35e238c9330669882487f9929e0aa97900431853
Merge branch 'master' of git://git.qemu.org/qemu into x86-next