OSDN Git Service

Merge remote-tracking branch 'remotes/mjt/tags/pull-trivial-patches-2014-11-11' into...
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 11 Nov 2014 14:50:10 +0000 (14:50 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 11 Nov 2014 14:50:10 +0000 (14:50 +0000)
commit776346cd63e5a1ceeeb4d81fa111d911abb73a69
treea74a0123d27295e38c176c417e96594e7a0364f7
parent844741451001cf1aadecde7e5c7b556b8fc4b70b
parent705be728c0b5546da10d8ef4239a112d1616bb97
Merge remote-tracking branch 'remotes/mjt/tags/pull-trivial-patches-2014-11-11' into staging

trivial patches for 2014-11-11

# gpg: Signature made Tue 11 Nov 2014 14:38:39 GMT using RSA key ID A4C3D7DB
# gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>"
# gpg:                 aka "Michael Tokarev <mjt@corpit.ru>"
# gpg:                 aka "Michael Tokarev <mjt@debian.org>"

* remotes/mjt/tags/pull-trivial-patches-2014-11-11:
  block: Fix comment for bdrv_co_get_block_status
  sysbus: Correct SYSTEM_BUS(obj) defines
  target-i386: cpu: keeping function parameters alignment on new line
  xen-hvm: Remove redundant variable 'xstate'
  coroutine-sigaltstack: Change jmp_buf to sigjmp_buf
  pc-bios: petalogix-s3adsp1800.dtb: Use 'xlnx, xps-ethernetlite-2.00.a' instead of 'xlnx, xps-ethernetlite-2.00.b'
  gdbstub: Add a missing case of signal number translation in gdbstub
  numa: make 'info numa' take into account hotplugged memory
  slirp/smbd: modify/set several parameters in generated smbd.conf
  qemu-doc.texi: fix typos in x509 examples
  icc_bus: fix typo ICC_BRIGDE -> ICC_BRIDGE

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
block.c
include/block/block.h
include/hw/sysbus.h
include/sysemu/sysemu.h
monitor.c
target-i386/cpu.c