]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'crypto/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 6 Dec 2011 00:54:17 +0000 (11:54 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 6 Dec 2011 00:54:17 +0000 (11:54 +1100)
1  2 
crypto/crypto_user.c
drivers/crypto/mv_cesa.c

Simple merge
Simple merge