diff options
| author | David S. Miller <davem@davemloft.net> | 2010-03-01 06:23:06 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-03-01 06:23:06 +0300 |
| commit | 47871889c601d8199c51a4086f77eebd77c29b0b (patch) | |
| tree | 40cdcac3bff0ee40cc33dcca61d0577cdf965f77 /crypto/aead.c | |
| parent | c16cc0b464b8876cfd57ce1c1dbcb6f9a6a0bce3 (diff) | |
| parent | 30ff056c42c665b9ea535d8515890857ae382540 (diff) | |
| download | linux-47871889c601d8199c51a4086f77eebd77c29b0b.tar.xz | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
drivers/firmware/iscsi_ibft.c
Diffstat (limited to 'crypto/aead.c')
| -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 0a55da70845e..6729e8ff68e7 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. * */ |