From: Herbert Xu Date: Fri, 5 Sep 2014 08:11:43 +0000 (+0800) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 X-Git-Tag: fixes-for-v3.18-merge-window~17^2~9 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea2d9fc1af6ebcdf849723ac4f3f91a1c93b5e7c;p=pandora-kernel.git Merge git://git./linux/kernel/git/herbert/crypto-2.6 Merging the crypto tree for 3.17 in order to resolve the conflict on the 32-bit DRBG overflow fix. --- ea2d9fc1af6ebcdf849723ac4f3f91a1c93b5e7c Reading git-diff-tree failed