diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2015-05-28 11:16:41 +0800 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2015-05-28 11:16:41 +0800 |
| commit | 6d7e3d89954af773c70948a54cfa2aaa15907c1c (patch) | |
| tree | 6908f5e0e1af7294c00dc4e06ed583ef62f594df /crypto/zlib.c | |
| parent | d725332208ef13241fc435eece790c9d0ea16a4e (diff) | |
| parent | f858c7bcca8c20761a20593439fe998b4b67e86b (diff) | |
| download | op-kernel-dev-6d7e3d89954af773c70948a54cfa2aaa15907c1c.zip op-kernel-dev-6d7e3d89954af773c70948a54cfa2aaa15907c1c.tar.gz | |
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 'crypto/zlib.c')
0 files changed, 0 insertions, 0 deletions
