net: clean up net/ipv4/ipip.c raw.c tcp.c tcp_minisocks.c tcp_yeah.c xfrm4_policy.c

Signed-off-by: Jianjun Kong <jianjun@zeuux.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

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

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

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

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

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

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