diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-19 23:36:17 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-19 23:36:17 -0400 |
| commit | c00046c279a2521075250fad682ca0acc10d4fd7 (patch) | |
| tree | 78a7e9089c26f199ad9b0161bb564b7c1ca6daf9 /crypto | |
| parent | 9abbf7d028b1598b40ebdc81c48f30da7f3d5bf5 (diff) | |
| parent | 8e8a1407ac23b43cec0412338c1b4f5e1c664550 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (74 commits)
fix do_sys_open() prototype
sysfs: trivial: fix sysfs_create_file kerneldoc spelling mistake
Documentation: Fix typo in SubmitChecklist.
Typo: depricated -> deprecated
Add missing profile=kvm option to Documentation/kernel-parameters.txt
fix typo about TBI in e1000 comment
proc.txt: Add /proc/stat field
small documentation fixes
Fix compiler warning in smount example program from sharedsubtree.txt
docs/sysfs: add missing word to sysfs attribute explanation
documentation/ext3: grammar fixes
Documentation/java.txt: typo and grammar fixes
Documentation/filesystems/vfs.txt: typo fix
include/asm-*/system.h: remove unused set_rmb(), set_wmb() macros
trivial copy_data_pages() tidy up
Fix typo in arch/x86/kernel/tsc_32.c
file link fix for Pegasus USB net driver help
remove unused return within void return function
Typo fixes retrun -> return
x86 hpet.h: remove broken links
...
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/api.c | 2 | ||||
| -rw-r--r-- | crypto/fcrypt.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/crypto/api.c b/crypto/api.c index 4ccc5af6c265..1f5c72477356 100644 --- a/crypto/api.c +++ b/crypto/api.c | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | * Copyright (c) 2005 Herbert Xu <herbert@gondor.apana.org.au> | 6 | * Copyright (c) 2005 Herbert Xu <herbert@gondor.apana.org.au> |
| 7 | * | 7 | * |
| 8 | * Portions derived from Cryptoapi, by Alexander Kjeldaas <astor@fast.no> | 8 | * Portions derived from Cryptoapi, by Alexander Kjeldaas <astor@fast.no> |
| 9 | * and Nettle, by Niels M๖ller. | 9 | * and Nettle, by Niels Mรถller. |
| 10 | * | 10 | * |
| 11 | * This program is free software; you can redistribute it and/or modify it | 11 | * This program is free software; you can redistribute it and/or modify it |
| 12 | * under the terms of the GNU General Public License as published by the Free | 12 | * under the terms of the GNU General Public License as published by the Free |
diff --git a/crypto/fcrypt.c b/crypto/fcrypt.c index 9c2bb535b09a..d161949fdb94 100644 --- a/crypto/fcrypt.c +++ b/crypto/fcrypt.c | |||
| @@ -10,7 +10,7 @@ | |||
| 10 | * | 10 | * |
| 11 | * Based on code: | 11 | * Based on code: |
| 12 | * | 12 | * |
| 13 | * Copyright (c) 1995 - 2000 Kungliga Tekniska H๖gskolan | 13 | * Copyright (c) 1995 - 2000 Kungliga Tekniska Hรถgskolan |
| 14 | * (Royal Institute of Technology, Stockholm, Sweden). | 14 | * (Royal Institute of Technology, Stockholm, Sweden). |
| 15 | * All rights reserved. | 15 | * All rights reserved. |
| 16 | * | 16 | * |