Merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git/

drivers/net/ppp_deflate.c

drivers/net/ppp_generic.c

drivers/net/wan/cycx_x25.c

drivers/net/wan/pc300_tty.c

drivers/net/wan/sdla_chdlc.c

drivers/net/wan/x25_asy.c

include/linux/rtnetlink.h

include/linux/xfrm.h

include/net/addrconf.h

include/net/pkt_sched.h

include/net/xfrm.h

kernel/audit.c

net/core/link_watch.c

net/core/netfilter.c

net/core/rtnetlink.c

net/decnet/dn_dev.c

net/decnet/netfilter/dn_rtmsg.c

net/ipv4/devinet.c

net/ipv4/ip_output.c

net/ipv4/netfilter/ip_conntrack_proto_tcp.c