]> rtime.felk.cvut.cz Git - lisovros/qemu_apohw.git/commit
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)
commitb1588c3fd6daf6e23ba727c758f84ada279ae731
tree3dad4f8f63a95e26d7d20582d5688c7f5dfaad3c
parent4eda32f588086b6cd0ec2be6a7a6c131f8c2b427
parentb5a87d26e848945eb891f4d7e4a7f2be514e08d5
Merge remote-tracking branch 'kiszka/queues/slirp' into staging

# 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>