diff options
| author | Peter Maydell | 2018-05-14 15:15:27 +0200 |
|---|---|---|
| committer | Peter Maydell | 2018-05-14 15:15:27 +0200 |
| commit | 7a9180b77eca258ab418ec00ab397392e70e55d9 (patch) | |
| tree | 32f36e18f92dc949195da0db6fe7ee3985f18ec1 /linux-user | |
| parent | Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' int... (diff) | |
| parent | net: Get rid of 'vlan' terminology and use 'hub' instead in the doc files (diff) | |
| download | qemu-7a9180b77eca258ab418ec00ab397392e70e55d9.tar.gz qemu-7a9180b77eca258ab418ec00ab397392e70e55d9.tar.xz qemu-7a9180b77eca258ab418ec00ab397392e70e55d9.zip | |
Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging
# gpg: Signature made Mon 14 May 2018 08:51:53 BST
# gpg: using RSA key EF04965B398D6211
# gpg: Good signature from "Jason Wang (Jason Wang on RedHat) <jasowang@redhat.com>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg: It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 215D 46F4 8246 689E C77F 3562 EF04 965B 398D 6211
* remotes/jasowang/tags/net-pull-request:
net: Get rid of 'vlan' terminology and use 'hub' instead in the doc files
net: Get rid of 'vlan' terminology and use 'hub' instead in the source files
net: Remove the deprecated "vlan" parameter
net: Fix memory leak in net_param_nic()
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'linux-user')
0 files changed, 0 insertions, 0 deletions