git.kernelconcepts.de Git - karo-tx-linux.git/commit

]> git.kernelconcepts.de Git - karo-tx-linux.git/commit

projects / karo-tx-linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 6c6cb88 821873a)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 21 Sep 2012 01:46:25 +0000 (11:46 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 21 Sep 2012 01:46:25 +0000 (11:46 +1000)
commit	6974f8f255874a751af74f7bac4da6b9c25012bd
tree	2f9a059e5af267dd75133b6ee8b01ca6d1f9c33e	tree \| snapshot
parent	6c6cb880b4dd2c191f4a035e3b09f335a6439a86	commit \| diff
parent	821873abc20e28fe3faa98591dab91d9b00700a5	commit \| diff

Merge remote-tracking branch 'crypto/master'

Conflicts:
crypto/Kconfig

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/arm/Makefile	diff1 \|	diff2 \|	blob \| history
arch/powerpc/configs/ppc64_defconfig	diff1 \|	diff2 \|	blob \| history
arch/powerpc/configs/pseries_defconfig	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/prom_init.c	diff1 \|	diff2 \|	blob \| history
crypto/Kconfig	diff1 \|	diff2 \|	blob \| history
crypto/crypto_user.c	diff1 \|	diff2 \|	blob \| history
drivers/crypto/caam/key_gen.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules