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

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

Tue, 13 Nov 2012 01:02:18 +0000 (12:02 +1100)

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

Tue, 13 Nov 2012 01:02:18 +0000 (12:02 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Nov 2012 01:02:18 +0000 (12:02 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Nov 2012 01:02:18 +0000 (12:02 +1100)
diff --cc MAINTAINERS
Simple merge
diff --cc arch/cris/include/uapi/asm/socket.h
Simple merge
diff --cc drivers/vhost/tcm_vhost.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 13 Nov 2012 01:02:18 +0000 (12:02 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 13 Nov 2012 01:02:18 +0000 (12:02 +1100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
arch/cris/include/uapi/asm/socket.h	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/vhost/tcm_vhost.c	patch \|	diff1 \|	diff2 \|	blob \| history