Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [SUNGEM]: Fix MAC address setting when interface is up. [IPV4] fib_trie: Document locking. [NET]: Correct accept(2) recovery after sock_attach_fd() [PPP]: Don't leak an sk_buff on interface destruction. [NET_SCHED]: Fix ingress locking [NET_SCHED]: cls_basic: fix NULL pointer dereference [DCCP]: make dccp_write_xmit_timer() static again [TG3]: Update version and reldate. [TG3]: Exit irq handler during chip reset. [TG3]: Eliminate the unused TG3_FLAG_SPLIT_MODE flag. [IPV6]: Fix routing round-robin locking. [DECNet] fib: Fix out of bound access of dn_fib_props[] [IPv4] fib: Fix out of bound access of fib_props[] [NET] AX.25 Kconfig and docs updates and fixes [NET]: Fix neighbour destructor handling. [NET]: Fix fib_rules compatibility breakage [SCTP]: Update SCTP Maintainers entry [NET]: remove unused header file: drivers/net/wan/lmc/lmc_media.h
No related branches found
No related tags found
Showing
- Documentation/networking/ax25.txt 6 additions, 12 deletionsDocumentation/networking/ax25.txt
- MAINTAINERS 3 additions, 0 deletionsMAINTAINERS
- drivers/infiniband/ulp/ipoib/ipoib_main.c 3 additions, 3 deletionsdrivers/infiniband/ulp/ipoib/ipoib_main.c
- drivers/net/ppp_generic.c 3 additions, 0 deletionsdrivers/net/ppp_generic.c
- drivers/net/sungem.c 30 additions, 0 deletionsdrivers/net/sungem.c
- drivers/net/tg3.c 69 additions, 65 deletionsdrivers/net/tg3.c
- drivers/net/tg3.h 1 addition, 4 deletionsdrivers/net/tg3.h
- drivers/net/wan/lmc/lmc_media.h 0 additions, 65 deletionsdrivers/net/wan/lmc/lmc_media.h
- include/net/fib_rules.h 1 addition, 0 deletionsinclude/net/fib_rules.h
- include/net/ip6_fib.h 1 addition, 0 deletionsinclude/net/ip6_fib.h
- include/net/neighbour.h 1 addition, 1 deletioninclude/net/neighbour.h
- net/atm/clip.c 0 additions, 9 deletionsnet/atm/clip.c
- net/ax25/Kconfig 36 additions, 25 deletionsnet/ax25/Kconfig
- net/core/dev.c 2 additions, 2 deletionsnet/core/dev.c
- net/core/fib_rules.c 30 additions, 0 deletionsnet/core/fib_rules.c
- net/core/neighbour.c 10 additions, 4 deletionsnet/core/neighbour.c
- net/dccp/dccp.h 0 additions, 1 deletionnet/dccp/dccp.h
- net/dccp/timer.c 1 addition, 1 deletionnet/dccp/timer.c
- net/decnet/dn_fib.c 4 additions, 1 deletionnet/decnet/dn_fib.c
- net/decnet/dn_rules.c 6 additions, 7 deletionsnet/decnet/dn_rules.c
Loading
Please register or sign in to comment