]> www.infradead.org Git - users/dwmw2/qemu.git/commit
projects / users / dwmw2 / qemu.git / commit
summary | shortlog | log | commit | commitdiff | tree
(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)
commit2c3445bb850fbfb4481e9487d8852f10e8c74e4c
tree8915a4e531121882809c7fa997db9b0983f5e724tree
parent7602e3e4a36715f8de9932dfd489cc4a2c6a7807commit | diff
parent5c1e1890bfa1f6b4bc3f51e368bfd47af1b60db0commit | diff
Merge remote-tracking branch 'remotes/kiszka/queues/slirp' into staging

* 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>
Unnamed repository; edit this file 'description' to name the repository.