diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-05 19:41:22 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-05 19:41:22 -0400 |
| commit | 9efe21cb82b5dbe3b0b2ae4de4eccc64ecb94e95 (patch) | |
| tree | 7ff8833745d2f268f897f6fa4a27263b4a572245 /fs/reiserfs/hashes.c | |
| parent | de18836e447c2dc30120c0919b8db8ddc0401cc4 (diff) | |
| parent | 0221c81b1b8eb0cbb6b30a0ced52ead32d2b4e4c (diff) | |
Merge branch 'linus' into irq/threaded
Conflicts:
include/linux/irq.h
kernel/irq/handle.c
Diffstat (limited to 'fs/reiserfs/hashes.c')
| -rw-r--r-- | fs/reiserfs/hashes.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/reiserfs/hashes.c b/fs/reiserfs/hashes.c index e664ac16fad9..6471c670743e 100644 --- a/fs/reiserfs/hashes.c +++ b/fs/reiserfs/hashes.c | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | * (see Applied Cryptography, 2nd edition, p448). | 7 | * (see Applied Cryptography, 2nd edition, p448). |
| 8 | * | 8 | * |
| 9 | * Jeremy Fitzhardinge <jeremy@zip.com.au> 1998 | 9 | * Jeremy Fitzhardinge <jeremy@zip.com.au> 1998 |
| 10 | * | 10 | * |
| 11 | * Jeremy has agreed to the contents of reiserfs/README. -Hans | 11 | * Jeremy has agreed to the contents of reiserfs/README. -Hans |
| 12 | * Yura's function is added (04/07/2000) | 12 | * Yura's function is added (04/07/2000) |
| 13 | */ | 13 | */ |