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: (235 commits) [NETFILTER]: Add H.323 conntrack/NAT helper [TG3]: Don't mark tg3_test_registers() as returning const. [IPV6]: Cleanups for net/ipv6/addrconf.c (kzalloc, early exit) v2 [IPV6]: Nearly complete kzalloc cleanup for net/ipv6 [IPV6]: Cleanup of net/ipv6/reassambly.c [BRIDGE]: Remove duplicate const from is_link_local() argument type. [DECNET]: net/decnet/dn_route.c: fix inconsequent NULL checking [TG3]: make drivers/net/tg3.c:tg3_request_irq() static [BRIDGE]: use LLC to send STP [LLC]: llc_mac_hdr_init const arguments [BRIDGE]: allow show/store of group multicast address [BRIDGE]: use llc for receiving STP packets [BRIDGE]: stp timer to jiffies cleanup [BRIDGE]: forwarding remove unneeded preempt and bh diasables [BRIDGE]: netfilter inline cleanup [BRIDGE]: netfilter VLAN macro cleanup [BRIDGE]: netfilter dont use __constant_htons [BRIDGE]: netfilter whitespace [BRIDGE]: optimize frame pass up [BRIDGE]: use kzalloc ...
Showing
- Documentation/connector/connector.txt 3 additions, 2 deletionsDocumentation/connector/connector.txt
- Documentation/networking/ip-sysctl.txt 47 additions, 2 deletionsDocumentation/networking/ip-sysctl.txt
- drivers/atm/suni.c 1 addition, 1 deletiondrivers/atm/suni.c
- drivers/connector/connector.c 4 additions, 3 deletionsdrivers/connector/connector.c
- drivers/infiniband/ulp/ipoib/ipoib_main.c 1 addition, 15 deletionsdrivers/infiniband/ulp/ipoib/ipoib_main.c
- drivers/net/8139too.c 1 addition, 1 deletiondrivers/net/8139too.c
- drivers/net/bnx2.c 173 additions, 304 deletionsdrivers/net/bnx2.c
- drivers/net/bnx2.h 23 additions, 14 deletionsdrivers/net/bnx2.h
- drivers/net/cassini.c 20 additions, 20 deletionsdrivers/net/cassini.c
- drivers/net/cassini.h 1 addition, 1 deletiondrivers/net/cassini.h
- drivers/net/e1000/e1000_main.c 1 addition, 1 deletiondrivers/net/e1000/e1000_main.c
- drivers/net/irda/Kconfig 8 additions, 0 deletionsdrivers/net/irda/Kconfig
- drivers/net/irda/Makefile 1 addition, 0 deletionsdrivers/net/irda/Makefile
- drivers/net/irda/donauboe.c 1 addition, 1 deletiondrivers/net/irda/donauboe.c
- drivers/net/irda/ep7211_ir.c 7 additions, 4 deletionsdrivers/net/irda/ep7211_ir.c
- drivers/net/irda/irtty-sir.c 10 additions, 9 deletionsdrivers/net/irda/irtty-sir.c
- drivers/net/irda/nsc-ircc.c 251 additions, 69 deletionsdrivers/net/irda/nsc-ircc.c
- drivers/net/irda/nsc-ircc.h 1 addition, 1 deletiondrivers/net/irda/nsc-ircc.h
- drivers/net/irda/sir_dongle.c 10 additions, 9 deletionsdrivers/net/irda/sir_dongle.c
- drivers/net/irda/toim3232-sir.c 375 additions, 0 deletionsdrivers/net/irda/toim3232-sir.c
Loading
Please register or sign in to comment