Merge "These changes are the raw update to qemu-2.6."
authorDon Dugger <n0ano@n0ano.com>
Fri, 3 Jun 2016 03:33:22 +0000 (03:33 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Fri, 3 Jun 2016 03:33:23 +0000 (03:33 +0000)

Trivial merge