diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2015-05-28 05:16:41 +0200 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2015-05-28 05:16:41 +0200 |
| commit | 6d7e3d89954af773c70948a54cfa2aaa15907c1c (patch) | |
| tree | 6908f5e0e1af7294c00dc4e06ed583ef62f594df /block/genhd.c | |
| parent | crypto: ccp - Remove unused structure field (diff) | |
| parent | crypto: algif_aead - Disable AEAD user-space for now (diff) | |
| download | linux-6d7e3d89954af773c70948a54cfa2aaa15907c1c.tar.xz linux-6d7e3d89954af773c70948a54cfa2aaa15907c1c.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Merge the crypto tree for 4.1 to pull in the changeset that disables
algif_aead.
Diffstat (limited to 'block/genhd.c')
0 files changed, 0 insertions, 0 deletions