Skip to content
  • Linus Torvalds's avatar
    Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · 3d1f337b
    Linus Torvalds authored
    * 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
      ...
    3d1f337b