]> git.proxmox.com Git - qemu.git/commitdiff
Merge remote-tracking branch 'kiszka/queues/slirp' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Thu, 20 Jun 2013 21:53:08 +0000 (16:53 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Thu, 20 Jun 2013 21:53:08 +0000 (16:53 -0500)
# By Bas van Sisseren (1) and Gertjan Halkes (1)
# Via Jan Kiszka
* kiszka/queues/slirp:
  make user networking hostfwd work with restrict=y
  fix -net user checks by reordering checks

Message-id: cover.1371638848.git.jan.kiszka@siemens.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

Trivial merge