]> git.proxmox.com Git - qemu.git/commitdiff
Merge remote-tracking branch 'mjt/trivial-patches-next' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 13 May 2013 14:44:25 +0000 (09:44 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 13 May 2013 14:44:25 +0000 (09:44 -0500)
# By Dong Xu Wang (2) and others
# Via Michael Tokarev
* mjt/trivial-patches-next:
  osdep.h: include sys/types.h for ssize_t definition
  remove double semicolons
  clean unnecessary code: don't check g_strdup arg for NULL
  docs: mention AddressSpaces in docs/memory.txt
  audio: update documentation after removing --audio-card-list option
  m25p80.c: Sync Flash chip list with Linux
  bsd-user: OS-agnostic 64-bit SYSCTL types

Message-id: 518F61B9.9050803@msgid.tls.msk.ru
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

Trivial merge