]> git.proxmox.com Git - mirror_qemu.git/commitdiff
projects / mirror_qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7602e3e 5c1e189)
Merge remote-tracking branch 'remotes/kiszka/queues/slirp' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Wed, 12 Mar 2014 12:47:26 +0000 (12:47 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Wed, 12 Mar 2014 12:47:26 +0000 (12:47 +0000)
* remotes/kiszka/queues/slirp:
  slirp smb with modern win guests when samba is also running on host
  qemu/slirp: Fix SMB security configuration on newer samba versions

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Trivial merge
QEMU mirror