Merge remote-tracking branch 'crypto/master'

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

Wed, 21 Dec 2011 02:25:47 +0000 (13:25 +1100)

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

Wed, 21 Dec 2011 02:25:47 +0000 (13:25 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 Dec 2011 02:25:47 +0000 (13:25 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 Dec 2011 02:25:47 +0000 (13:25 +1100)
diff --cc crypto/crypto_user.c
Simple merge
diff --cc drivers/crypto/mv_cesa.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 21 Dec 2011 02:25:47 +0000 (13:25 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 21 Dec 2011 02:25:47 +0000 (13:25 +1100)
		1	2
crypto/crypto_user.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/crypto/mv_cesa.c	patch \|	diff1 \|	diff2 \|	blob \| history