Merge remote-tracking branch 'net-next/master'

author Stephen Rothwell <sfr@canb.auug.org.au>

Wed, 24 Oct 2012 00:42:45 +0000 (11:42 +1100)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Wed, 24 Oct 2012 00:42:45 +0000 (11:42 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 24 Oct 2012 00:42:45 +0000 (11:42 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 24 Oct 2012 00:42:45 +0000 (11:42 +1100)
diff --cc MAINTAINERS
Simple merge
diff --cc include/uapi/linux/usb/cdc.h
Simple merge
diff --cc net/ipv4/tcp.c
Simple merge
diff --cc net/ipv4/tcp_input.c
Simple merge
diff --cc net/ipv4/tcp_ipv4.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 24 Oct 2012 00:42:45 +0000 (11:42 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 24 Oct 2012 00:42:45 +0000 (11:42 +1100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
include/uapi/linux/usb/cdc.h	patch \|	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_input.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_ipv4.c	patch \|	diff1 \|	diff2 \|	blob \| history