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/cipher.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/cipher.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/cipher.c b/crypto/cipher.c index 9a1a7316..39541e0e 100644 --- a/crypto/cipher.c +++ b/crypto/cipher.c @@ -8,7 +8,7 @@ * * 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. * */ |