]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'crypto/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 5 Aug 2013 01:46:59 +0000 (11:46 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 5 Aug 2013 01:46:59 +0000 (11:46 +1000)
1  2 
crypto/testmgr.c
drivers/crypto/caam/caamhash.c

Simple merge
Simple merge