OSDN Git Service
(root)
/
qmiga
/
qemu.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7602e3e
5c1e189
)
Merge remote-tracking branch 'remotes/kiszka/queues/slirp' into staging
author
Peter Maydell
<peter.maydell@linaro.org>
Wed, 12 Mar 2014 12:47:26 +0000
(12:47 +0000)
committer
Peter 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