From: Anthony Liguori <aliguori@us.ibm.com>
Date: Tue, 1 May 2012 23:48:01 +0000 (-0500)
Subject: Merge remote-tracking branch 'kiszka/queues/slirp' into staging
X-Git-Tag: v1.1-rc0~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=563987d0a799f90b58a575b190a57546c335191b;p=thirdparty%2Fqemu.git

Merge remote-tracking branch 'kiszka/queues/slirp' into staging

* kiszka/queues/slirp:
  Declare state directory in smb.conf
  slirp: don't use "smb ports = 0" option
---

563987d0a799f90b58a575b190a57546c335191b