Merge remote-tracking branch 'cris/for-next'

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

Sun, 1 Apr 2012 23:59:49 +0000 (09:59 +1000)

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

Sun, 1 Apr 2012 23:59:49 +0000 (09:59 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Sun, 1 Apr 2012 23:59:49 +0000 (09:59 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Sun, 1 Apr 2012 23:59:49 +0000 (09:59 +1000)
diff --cc arch/cris/arch-v32/drivers/cryptocop.c
Simple merge
diff --cc arch/cris/arch-v32/kernel/ptrace.c
Simple merge
diff --cc drivers/net/cris/eth_v10.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Sun, 1 Apr 2012 23:59:49 +0000 (09:59 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Sun, 1 Apr 2012 23:59:49 +0000 (09:59 +1000)
		1	2
arch/cris/arch-v32/drivers/cryptocop.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/cris/arch-v32/kernel/ptrace.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/cris/eth_v10.c	patch \|	diff1 \|	diff2 \|	blob \| history