Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6