Merge gregkh@master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Documentation/networking/ip-sysctl.txt

drivers/net/bnx2.c

drivers/net/bnx2.h

drivers/net/ppp_generic.c

include/linux/if_vlan.h

include/linux/netdevice.h

net/atm/proc.c

net/bridge/br_if.c

net/core/dev.c

net/core/utils.c

net/ipv4/fib_semantics.c

net/ipv4/igmp.c

net/ipv4/netfilter/ip_conntrack_netlink.c

net/ipv4/netfilter/ip_tables.c

net/ipv6/icmp.c

net/ipv6/mcast.c

net/netfilter/nf_conntrack_netlink.c

net/netfilter/xt_physdev.c

net/sched/cls_u32.c