diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2010-10-30 07:35:11 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2010-10-30 07:35:11 -0400 |
| commit | 67577927e8d7a1f4b09b4992df640eadc6aacb36 (patch) | |
| tree | 2e9efe6b5745965faf0dcc084d4613d9356263f9 /include/crypto/gf128mul.h | |
| parent | 6fe4c590313133ebd5dadb769031489ff178ece1 (diff) | |
| parent | 51f00a471ce8f359627dd99aeac322947a0e491b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Conflicts:
drivers/mtd/mtd_blkdevs.c
Merge Grant's device-tree bits so that we can apply the subsequent fixes.
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'include/crypto/gf128mul.h')
| -rw-r--r-- | include/crypto/gf128mul.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/crypto/gf128mul.h b/include/crypto/gf128mul.h index 4086b8ebfaf..da2530e34b2 100644 --- a/include/crypto/gf128mul.h +++ b/include/crypto/gf128mul.h | |||
| @@ -54,8 +54,8 @@ | |||
| 54 | 54 | ||
| 55 | /* Comment by Rik: | 55 | /* Comment by Rik: |
| 56 | * | 56 | * |
| 57 | * For some background on GF(2^128) see for example: http://- | 57 | * For some background on GF(2^128) see for example: |
| 58 | * csrc.nist.gov/CryptoToolkit/modes/proposedmodes/gcm/gcm-revised-spec.pdf | 58 | * http://csrc.nist.gov/groups/ST/toolkit/BCM/documents/proposedmodes/gcm/gcm-revised-spec.pdf |
| 59 | * | 59 | * |
| 60 | * The elements of GF(2^128) := GF(2)[X]/(X^128-X^7-X^2-X^1-1) can | 60 | * The elements of GF(2^128) := GF(2)[X]/(X^128-X^7-X^2-X^1-1) can |
| 61 | * be mapped to computer memory in a variety of ways. Let's examine | 61 | * be mapped to computer memory in a variety of ways. Let's examine |