• P
    Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging · 2c107d76
    Peter Maydell 提交于
    # gpg: Signature made Thu 02 Jun 2016 07:23:18 BST using RSA key ID 398D6211
    # 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: (31 commits)
      Add ENET device to i.MX6 SOC.
      Add ENET/Gbps Ethernet support to FEC device
      i.MX: move FEC device to a register array structure.
      i.MX: Rename i.MX FEC defines to ENET_XXX
      i.MX: reset TX/RX descriptors when FEC is disabled.
      i.MX: Fix FEC code for ECR register reset value.
      i.MX: Fix FEC code for MDIO address selection
      i.MX: Fix FEC code for MDIO operation selection
      net: handle optional VLAN header in checksum computation.
      net: improve UDP/TCP checksum computation.
      e1000e: Introduce qtest for e1000e device
      net: Introduce e1000e device emulation
      e1000: Move out code that will be reused in e1000e
      e1000_regs: Add definitions for Intel 82574-specific bits
      vmxnet3: Use pci_dma_* API instead of cpu_physical_memory_*
      net_pkt: Extend packet abstraction as required by e1000e functionality
      rtl8139: Move more TCP definitions to common header
      net_pkt: Name vmxnet3 packet abstractions more generic
      vmxnet3: Use common MAC address tracing macros
      net: Add macros for MAC address tracing
      ...
    Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
    2c107d76
MAINTAINERS 32.3 KB