Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (23 commits) bridge: Fix LRO crash with tun IPv6: fix to set device name when new IPv6 over IPv6 tunnel device is created. gianfar: Fix boot hangs while bringing up gianfar ethernet netfilter: xt_sctp: sctp chunk mapping doesn't work netfilter: ctnetlink: fix echo if not subscribed to any multicast group netfilter: ctnetlink: allow changing NAT sequence adjustment in creation netfilter: nf_conntrack_ipv6: don't track ICMPv6 negotiation message netfilter: fix tuple inversion for Node information request netxen: fix msi-x interrupt handling de2104x: force correct order when writing to rx ring tun: Fix unicast filter overflow drivers/isdn: introduce missing kfree drivers/atm: introduce missing kfree sunhme: Don't match PCI devices in SBUS probe. 9p: fix endian issues [attempt 3] net_dma: call dmaengine_get only if NET_DMA enabled 3c509: Fix resume from hibernation for PnP mode. sungem: Soft lockup in sungem on Netra AC200 when switching interface up RxRPC: Fix a potential NULL dereference r8169: Don't update statistics counters when interface is down ...
Showing
- drivers/atm/solos-pci.c 1 addition, 0 deletionsdrivers/atm/solos-pci.c
- drivers/isdn/hardware/mISDN/hfcmulti.c 2 additions, 0 deletionsdrivers/isdn/hardware/mISDN/hfcmulti.c
- drivers/net/3c509.c 1 addition, 0 deletionsdrivers/net/3c509.c
- drivers/net/gianfar.c 6 additions, 0 deletionsdrivers/net/gianfar.c
- drivers/net/netxen/netxen_nic.h 1 addition, 1 deletiondrivers/net/netxen/netxen_nic.h
- drivers/net/netxen/netxen_nic_main.c 12 additions, 1 deletiondrivers/net/netxen/netxen_nic_main.c
- drivers/net/r8169.c 58 additions, 35 deletionsdrivers/net/r8169.c
- drivers/net/sungem.c 4 additions, 4 deletionsdrivers/net/sungem.c
- drivers/net/sunhme.c 8 additions, 4 deletionsdrivers/net/sunhme.c
- drivers/net/tulip/de2104x.c 2 additions, 1 deletiondrivers/net/tulip/de2104x.c
- drivers/net/tun.c 8 additions, 2 deletionsdrivers/net/tun.c
- include/linux/dmaengine.h 12 additions, 0 deletionsinclude/linux/dmaengine.h
- net/9p/protocol.c 13 additions, 9 deletionsnet/9p/protocol.c
- net/bridge/br_forward.c 6 additions, 1 deletionnet/bridge/br_forward.c
- net/core/dev.c 2 additions, 2 deletionsnet/core/dev.c
- net/core/neighbour.c 8 additions, 6 deletionsnet/core/neighbour.c
- net/ipv4/udp.c 4 additions, 2 deletionsnet/ipv4/udp.c
- net/ipv6/ip6_flowlabel.c 6 additions, 2 deletionsnet/ipv6/ip6_flowlabel.c
- net/ipv6/ip6_tunnel.c 1 addition, 1 deletionnet/ipv6/ip6_tunnel.c
- net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c 23 additions, 2 deletionsnet/ipv6/netfilter/nf_conntrack_proto_icmpv6.c
Loading
Please register or sign in to comment