Skip to content
  • Peter Maydell's avatar
    7a9180b7
    Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging · 7a9180b7
    Peter Maydell authored
    
    
    # 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: default avatarPeter Maydell <peter.maydell@linaro.org>
    7a9180b7
    Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging
    Peter Maydell authored
    
    
    # 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: default avatarPeter Maydell <peter.maydell@linaro.org>
Loading