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

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

projects / karo-tx-linux.git / commit

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

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 19 Sep 2012 01:50:25 +0000 (11:50 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 19 Sep 2012 01:50:25 +0000 (11:50 +1000)
commit	ea7428b5111bb34277e6dcfd6a7a469c50e3693e
tree	75704e8fe0eac975aebdca4d57dab168fceb3d22	tree \| snapshot
parent	fae3d23d7ebe0c1ba0ef5ce2830028f76baf5682	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