Merge remote-tracking branch 'crypto/master'

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

Wed, 25 Jul 2012 00:41:49 +0000 (10:41 +1000)

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

Wed, 25 Jul 2012 00:41:49 +0000 (10:41 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 25 Jul 2012 00:41:49 +0000 (10:41 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 25 Jul 2012 00:41:49 +0000 (10:41 +1000)
diff --cc arch/arm/mach-at91/at91sam9g45.c
Simple merge
diff --cc arch/arm/mach-at91/at91sam9g45_devices.c
Simple merge
diff --cc drivers/char/hw_random/Kconfig
Simple merge
diff --cc drivers/char/hw_random/Makefile
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 25 Jul 2012 00:41:49 +0000 (10:41 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 25 Jul 2012 00:41:49 +0000 (10:41 +1000)
		1	2
arch/arm/mach-at91/at91sam9g45.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/at91sam9g45_devices.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/char/hw_random/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/char/hw_random/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history