From: Anthony Liguori <aliguori@us.ibm.com>
Date: Mon, 22 Jul 2013 15:13:49 +0000 (-0500)
Subject: Merge remote-tracking branch 'mjt/trivial-patches' into staging
X-Git-Tag: qemu-xen-4.4.0-rc1~6^2~182
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=a20bd9eec3cf3f9dd7e27d45a96d7b1b9ab09ebd;p=qemu-upstream-4.4-testing.git

Merge remote-tracking branch 'mjt/trivial-patches' into staging

# By Michael Tokarev (2) and others
# Via Michael Tokarev
* mjt/trivial-patches:
  doc: monitor multiplexing rewording
  block/m25p80: Update Micron entries
  Fix command example in qemu.sasl
  slirp: remove mbuf(m_hdr,m_dat) indirection
  linux-user: declare sys_futex to have 6 arguments

Message-id: 1374225073-12959-1-git-send-email-mjt@msgid.tls.msk.ru
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---

a20bd9eec3cf3f9dd7e27d45a96d7b1b9ab09ebd