Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

diff --cc MAINTAINERS
Simple merge

diff --cc include/net/sctp/sctp.h
Simple merge

diff --cc net/core/netpoll.c
Simple merge

diff --cc net/ipv4/tcp_output.c
Simple merge

diff --cc net/sctp/ipv6.c
Simple merge

diff --cc net/sctp/protocol.c
Simple merge