diff options
author | Henrique de Moraes Holschuh <hmh@hmh.eng.br> | 2010-05-16 19:40:56 -0300 |
---|---|---|
committer | Henrique de Moraes Holschuh <hmh@hmh.eng.br> | 2010-05-16 19:40:56 -0300 |
commit | 1c93dc3bd2d1f3f22f021b036c647db1316a7083 (patch) | |
tree | 1678134117b42ea7af7d7b4c1f10e864d486ae25 /crypto/aead.c | |
parent | 39fa904443d5fef09dfeb90b94ec9892a5a96a35 (diff) | |
parent | 30800d10f2872689cd78711f26b065494df8bb74 (diff) | |
download | linux-crypto-1c93dc3bd2d1f3f22f021b036c647db1316a7083.tar.gz linux-crypto-1c93dc3bd2d1f3f22f021b036c647db1316a7083.zip |
Merge mainline (v2.6.34-rc7)
Diffstat (limited to '')
-rw-r--r-- | crypto/aead.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/aead.c b/crypto/aead.c index 0a55da70..6729e8ff 100644 --- a/crypto/aead.c +++ b/crypto/aead.c @@ -1,13 +1,13 @@ /* * AEAD: Authenticated Encryption with Associated Data - * + * * This file provides API support for AEAD algorithms. * * Copyright (c) 2007 Herbert Xu <herbert@gondor.apana.org.au> * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the Free - * Software Foundation; either version 2 of the License, or (at your option) + * Software Foundation; either version 2 of the License, or (at your option) * any later version. * */ |