]> 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>
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)
commit563987d0a799f90b58a575b190a57546c335191b
tree6383b008e7be6cefaab9dfeaa1ba7374b322f169
parent15a0f3bf77cf60ae29484f0c0a26c679e4c688fd
parent276eda5735824dd6cf66e1f0951aa8af97354540
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