Merge remote-tracking branch 'net/master'

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

Sun, 1 Apr 2012 23:56:11 +0000 (09:56 +1000)

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

Sun, 1 Apr 2012 23:56:11 +0000 (09:56 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Sun, 1 Apr 2012 23:56:11 +0000 (09:56 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Sun, 1 Apr 2012 23:56:11 +0000 (09:56 +1000)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/net/bonding/bond_main.c
Simple merge
diff --cc net/core/dev.c
Simple merge
diff --cc net/ipv4/route.c
Simple merge
diff --cc net/rose/rose_dev.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Sun, 1 Apr 2012 23:56:11 +0000 (09:56 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Sun, 1 Apr 2012 23:56:11 +0000 (09:56 +1000)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/bonding/bond_main.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/ipv4/route.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/rose/rose_dev.c	patch \|	diff1 \|	diff2 \|	blob \| history