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: [NET_SCHED]: HFSC: fix thinko in hfsc_adjust_levels() [IPV6]: skb leakage in inet6_csk_xmit [BRIDGE]: Do sysfs registration inside rtnl. [NET]: Do sysfs registration as part of register_netdevice. [TG3]: Fix possible NULL deref in tg3_run_loopback(). [NET] linkwatch: Handle jiffies wrap-around [IRDA]: Switching to a workqueue for the SIR work [IRDA]: smsc-ircc: Minimal hotplug support. [IRDA]: Removing unused EXPORT_SYMBOLs [IRDA]: New maintainer. [NET]: Make netdev_chain a raw notifier. [IPV4]: ip_options_fragment() has no effect on fragmentation [NET]: Add missing operstates documentation.
No related branches found
No related tags found
Showing
- Documentation/networking/operstates.txt 161 additions, 0 deletionsDocumentation/networking/operstates.txt
- MAINTAINERS 3 additions, 2 deletionsMAINTAINERS
- drivers/net/irda/Makefile 1 addition, 1 deletiondrivers/net/irda/Makefile
- drivers/net/irda/sir-dev.h 2 additions, 11 deletionsdrivers/net/irda/sir-dev.h
- drivers/net/irda/sir_dev.c 311 additions, 4 deletionsdrivers/net/irda/sir_dev.c
- drivers/net/irda/sir_kthread.c 0 additions, 508 deletionsdrivers/net/irda/sir_kthread.c
- drivers/net/irda/smsc-ircc2.c 13 additions, 1 deletiondrivers/net/irda/smsc-ircc2.c
- drivers/net/tg3.c 3 additions, 0 deletionsdrivers/net/tg3.c
- include/linux/netdevice.h 1 addition, 2 deletionsinclude/linux/netdevice.h
- net/bridge/br_if.c 7 additions, 14 deletionsnet/bridge/br_if.c
- net/core/dev.c 45 additions, 54 deletionsnet/core/dev.c
- net/core/link_watch.c 5 additions, 5 deletionsnet/core/link_watch.c
- net/ipv4/ip_options.c 1 addition, 1 deletionnet/ipv4/ip_options.c
- net/ipv6/inet6_connection_sock.c 2 additions, 0 deletionsnet/ipv6/inet6_connection_sock.c
- net/irda/irias_object.c 0 additions, 3 deletionsnet/irda/irias_object.c
- net/sched/sch_hfsc.c 3 additions, 3 deletionsnet/sched/sch_hfsc.c
Loading
Please register or sign in to comment