]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
authorHerbert Xu <herbert@gondor.apana.org.au>
Mon, 10 Oct 2016 03:19:47 +0000 (11:19 +0800)
committerHerbert Xu <herbert@gondor.apana.org.au>
Mon, 10 Oct 2016 03:19:47 +0000 (11:19 +0800)
commitc3afafa47898e34eb49828ec4ac92bcdc81c8f0c
tree055f603e131de9c4d36dafb1856fe69c737152de
parentf97581cfa6e7db9818520597b8a44f8268d75013
parent80da44c29d997e28c4442825f35f4ac339813877
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

Merge the crypto tree to pull in vmx ghash fix.
drivers/char/hw_random/Kconfig
drivers/crypto/caam/caamalg.c