projects / cascardo / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0e56673 78f543a)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorHerbert Xu <herbert@gondor.apana.org.au>
Fri, 5 Sep 2014 08:11:43 +0000 (16:11 +0800)
committerHerbert Xu <herbert@gondor.apana.org.au>
Fri, 5 Sep 2014 08:11:43 +0000 (16:11 +0800)
Merging the crypto tree for 3.17 in order to resolve the conflict
on the 32-bit DRBG overflow fix.

1  2 
crypto/drbg.c patch | diff1 | diff2 | blob | history

diff --cc crypto/drbg.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.