Merge branch 'master' of ../net-2.6/

Conflicts:

	net/ipv6/ndisc.c

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

diff --cc net/atm/clip.c
Simple merge

diff --cc net/atm/lec.c
Simple merge

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

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