diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-03-12 12:47:26 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-03-12 12:47:26 +0000 |
| commit | 2c3445bb850fbfb4481e9487d8852f10e8c74e4c (patch) | |
| tree | 8915a4e531121882809c7fa997db9b0983f5e724 /.gitmodules | |
| parent | 7602e3e4a36715f8de9932dfd489cc4a2c6a7807 (diff) | |
| parent | 5c1e1890bfa1f6b4bc3f51e368bfd47af1b60db0 (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>
Diffstat (limited to '.gitmodules')
0 files changed, 0 insertions, 0 deletions