Merge remote-tracking branch 'stefanha/trivial-patches' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Fri, 26 Apr 2013 13:32:13 +0000 (08:32 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Fri, 26 Apr 2013 13:32:13 +0000 (08:32 -0500)
commit186b027d98a3c91c1c6dee631a027d5b2a0fce25
tree81d11194e1f5c5e2bce14a807d0b01876c0a3e53
parenta1bff71c56f2d1048244c829b63797940dd4ba0e
parent6ea8430d98c48eb67e47d14dfe8c0fdb86413555
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 <aliguori@us.ibm.com>