projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 15a0f3b 276eda5)
Merge remote-tracking branch 'kiszka/queues/slirp' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Tue, 1 May 2012 23:48:01 +0000 (18:48 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 1 May 2012 23:48:01 +0000 (18:48 -0500)
* kiszka/queues/slirp:
  Declare state directory in smb.conf
  slirp: don't use "smb ports = 0" option


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.