From: Anthony Liguori Date: Fri, 26 Apr 2013 13:32:13 +0000 (-0500) Subject: Merge remote-tracking branch 'stefanha/trivial-patches' into staging X-Git-Tag: TizenStudio_2.0_p2.3.2~208^2~1985 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=186b027d98a3c91c1c6dee631a027d5b2a0fce25;p=sdk%2Femulator%2Fqemu.git Merge remote-tracking branch 'stefanha/trivial-patches' into staging # By Ed Maste (2) and others # Via Stefan Hajnoczi * stefanha/trivial-patches: bsd-user: Track change in FreeBSD SYSCTL(9) types virtio: Fix compilation without CONFIG_VHOST_SCSI qemu-doc: Option -ignore-environment removed. s390x: use CONFIG_INT128 to detect __uint128_t linux-user: fix compile error due to stray colon at end of #ifdef line Message-id: 1366975563-16216-1-git-send-email-stefanha@redhat.com Signed-off-by: Anthony Liguori --- 186b027d98a3c91c1c6dee631a027d5b2a0fce25