diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2016-10-10 11:19:47 +0800 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2016-10-10 11:19:47 +0800 |
| commit | c3afafa47898e34eb49828ec4ac92bcdc81c8f0c (patch) | |
| tree | 055f603e131de9c4d36dafb1856fe69c737152de /block/blk-timeout.c | |
| parent | f97581cfa6e7db9818520597b8a44f8268d75013 (diff) | |
| parent | 80da44c29d997e28c4442825f35f4ac339813877 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Merge the crypto tree to pull in vmx ghash fix.
Diffstat (limited to 'block/blk-timeout.c')
0 files changed, 0 insertions, 0 deletions