]> git.proxmox.com Git - qemu.git/commitdiff
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 11 Mar 2013 00:33:03 +0000 (19:33 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 11 Mar 2013 00:33:03 +0000 (19:33 -0500)
# By Lei Li (2) and others
# Via Stefan Hajnoczi
* stefanha/trivial-patches:
  Fix the wrong description in qemu manual
  pci_host: Drop write-only address_space field
  rng-random: Use qemu_open / qemu_close
  configure: Require at least spice-protocol-0.12.3
  osdep: replace setsockopt by qemu_setsockopt
  lm32: remove unused function
  rtc-test: Fix test failures with recent glib
  configure: Create link to icon bitmap for out-of-tree builds

1  2 
configure

diff --cc configure
Simple merge