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

include/linux/atalk.h

include/linux/netlink.h

include/linux/pfkeyv2.h

include/linux/xfrm.h

include/net/ax25.h

include/net/ip_fib.h

include/net/sctp/command.h

include/net/sctp/constants.h

include/net/sctp/sctp.h

include/net/sctp/sm.h

include/net/sctp/structs.h

include/net/sctp/user.h

include/net/xfrm.h

net/appletalk/aarp.c

net/appletalk/ddp.c

net/ipv4/ah4.c

net/ipv4/esp4.c

net/ipv4/fib_frontend.c

net/ipv4/ipcomp.c

net/ipv4/xfrm4_output.c