Merge remote-tracking branch 'crypto/master'

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

Fri, 24 Aug 2012 01:56:16 +0000 (11:56 +1000)

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

Fri, 24 Aug 2012 01:56:16 +0000 (11:56 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 24 Aug 2012 01:56:16 +0000 (11:56 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 24 Aug 2012 01:56:16 +0000 (11:56 +1000)
diff --cc MAINTAINERS
Simple merge
diff --cc crypto/Kconfig
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 24 Aug 2012 01:56:16 +0000 (11:56 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 24 Aug 2012 01:56:16 +0000 (11:56 +1000)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
crypto/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history