This is another trivial-patches pull request. This time we have just 5 patches accumulated in two (!) weeks period. Please consider apply.
/mjt The following changes since commit 24943978cbe79634a9a8b02a20efb25b29b3ab49: boot-order-test: Add tests for Sun4u (2013-07-18 13:27:47 -0500) are available in the git repository at: git://git.corpit.ru/qemu.git trivial-patches for you to fetch changes up to be022d61f4938bb051e8af8e6cb470ec1602c488: doc: monitor multiplexing rewording (2013-07-19 12:52:03 +0400) ---------------------------------------------------------------- Cole Robinson (1): Fix command example in qemu.sasl Ed Maste (1): block/m25p80: Update Micron entries Michael Tokarev (2): slirp: remove mbuf(m_hdr,m_dat) indirection doc: monitor multiplexing rewording Petar Jovanovic (1): linux-user: declare sys_futex to have 6 arguments hw/block/m25p80.c | 12 ++++++++---- linux-user/main.c | 2 +- qemu-options.hx | 4 ++-- qemu.sasl | 2 +- slirp/mbuf.h | 51 ++++++++++++++++++--------------------------------- slirp/tcp_subr.c | 12 ++++++------ 6 files changed, 36 insertions(+), 47 deletions(-)