Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.25
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.25: (1470 commits) [IPV6] ADDRLABEL: Fix double free on label deletion. [PPP]: Sparse warning fixes. [IPV4] fib_trie: remove unneeded NULL check [IPV4] fib_trie: More whitespace cleanup. [NET_SCHED]: Use nla_policy for attribute validation in ematches [NET_SCHED]: Use nla_policy for attribute validation in actions [NET_SCHED]: Use nla_policy for attribute validation in classifiers [NET_SCHED]: Use nla_policy for attribute validation in packet schedulers [NET_SCHED]: sch_api: introduce constant for rate table size [NET_SCHED]: Use typeful attribute parsing helpers [NET_SCHED]: Use typeful attribute construction helpers [NET_SCHED]: Use NLA_PUT_STRING for string dumping [NET_SCHED]: Use nla_nest_start/nla_nest_end [NET_SCHED]: Propagate nla_parse return value [NET_SCHED]: act_api: use PTR_ERR in tcf_action_init/tcf_action_get [NET_SCHED]: act_api: use nlmsg_parse [NET_SCHED]: act_api: fix netlink API conversion bug [NET_SCHED]: sch_netem: use nla_parse_nested_compat [NET_SCHED]: sch_atm: fix format string warning [NETNS]: Add namespace for ICMP replying code. ...
Showing
- CREDITS 16 additions, 0 deletionsCREDITS
- Documentation/feature-removal-schedule.txt 66 additions, 18 deletionsDocumentation/feature-removal-schedule.txt
- Documentation/networking/00-INDEX 2 additions, 2 deletionsDocumentation/networking/00-INDEX
- Documentation/networking/bonding.txt 143 additions, 61 deletionsDocumentation/networking/bonding.txt
- Documentation/networking/can.txt 629 additions, 0 deletionsDocumentation/networking/can.txt
- Documentation/networking/dccp.txt 32 additions, 7 deletionsDocumentation/networking/dccp.txt
- Documentation/networking/ip-sysctl.txt 27 additions, 0 deletionsDocumentation/networking/ip-sysctl.txt
- Documentation/networking/shaper.txt 0 additions, 48 deletionsDocumentation/networking/shaper.txt
- Documentation/networking/udplite.txt 1 addition, 1 deletionDocumentation/networking/udplite.txt
- Documentation/networking/xfrm_proc.txt 70 additions, 0 deletionsDocumentation/networking/xfrm_proc.txt
- MAINTAINERS 45 additions, 3 deletionsMAINTAINERS
- arch/ia64/hp/sim/simeth.c 0 additions, 5 deletionsarch/ia64/hp/sim/simeth.c
- arch/powerpc/platforms/pasemi/Makefile 1 addition, 1 deletionarch/powerpc/platforms/pasemi/Makefile
- arch/powerpc/platforms/pasemi/dma_lib.c 488 additions, 0 deletionsarch/powerpc/platforms/pasemi/dma_lib.c
- arch/powerpc/platforms/pasemi/pasemi.h 1 addition, 0 deletionsarch/powerpc/platforms/pasemi/pasemi.h
- arch/ppc/8260_io/enet.c 2 additions, 2 deletionsarch/ppc/8260_io/enet.c
- arch/ppc/8260_io/fcc_enet.c 2 additions, 2 deletionsarch/ppc/8260_io/fcc_enet.c
- drivers/atm/ambassador.c 1 addition, 2 deletionsdrivers/atm/ambassador.c
- drivers/atm/he.c 6 additions, 8 deletionsdrivers/atm/he.c
- drivers/connector/cn_queue.c 0 additions, 2 deletionsdrivers/connector/cn_queue.c
Please register or sign in to comment