Merge branch 'v3.6-branch' into kis

Conflicts:
	net/ipv4/tcp_input.c
	net/ipv4/tcp_ipv4.c
	net/ipv6/tcp_ipv6.c

Conflicts resolved.
Remove unsed variable in tcp_estats.c.
Merge branch 'v3.7-branch' into kis

Conflicts:
	include/linux/tcp.h
	net/ipv4/tcp.c
	net/ipv4/tcp_input.c
	net/ipv4/tcp_ipv4.c

Conflicts resolved.
Merge branch 'v3.8-branch' into kis

Conflicts:
	net/ipv4/tcp_input.c

Conflicts resolved.
Merge branch 'v3.9-branch' into kis

Conflicts:
	net/ipv4/tcp_cong.c
	net/ipv4/tcp_input.c

Conflicts resolved.
Formatting.
Added uid/gid members to stats; removed spurious sock_i_uid that was
called too early in sock allocation.
Added CONFIG option for ElaspedSecs/Msecs.
Changed option name to CONFIG_TCP_ESTATS_STRICT_ELAPSEDTIME.
KIS refactor patch; improvements; jump_label; submitted by Dominic
Hamon.
Fix check for non-null path_table in tcp_estats_update_*_congestion.
Fix from Dominic Hamon to check static_key state before slow_in/dec.
Revert to 193aed6d261d5324dfa6d3c7a8581aac01334df8
Check enabled state of static_key before slow_inc/dec.
Add per-connection LimSsthresh (RFC3742) to tune table.
Add check for stats before dereference.
Dominic's fix to avoid race condition on static key.
Fixx over-counting of SlowStart and CongAvoid.
Trivial formatting difference caused tcp_cubic.c to be included in
patch.
Merge branch 'linux-3.10' into kis

Conflicts:
	include/linux/tcp.h
	net/ipv4/tcp_input.c
	net/ipv4/tcp_ipv4.c
	net/ipv4/tcp_output.c
	net/ipv6/tcp_ipv6.c

Conflicts resolved.