diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2010-08-06 10:37:02 -0400 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2010-08-06 10:37:02 -0400 |
| commit | ab11b487402f97975f3ac1eeea09c82f4431481e (patch) | |
| tree | 86337c5cbbd2b0c4bd07c0847a1dc7de3d898147 /lib/random32.c | |
| parent | 1c689cbcf2c2b7a35cd237abddd9206bb1b6fee1 (diff) | |
| parent | fc1caf6eafb30ea185720e29f7f5eccca61ecd60 (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'lib/random32.c')
| -rw-r--r-- | lib/random32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/random32.c b/lib/random32.c index 870dc3fc0f0f..fc3545a32771 100644 --- a/lib/random32.c +++ b/lib/random32.c | |||
| @@ -127,7 +127,7 @@ core_initcall(random32_init); | |||
| 127 | 127 | ||
| 128 | /* | 128 | /* |
| 129 | * Generate better values after random number generator | 129 | * Generate better values after random number generator |
| 130 | * is fully initalized. | 130 | * is fully initialized. |
| 131 | */ | 131 | */ |
| 132 | static int __init random32_reseed(void) | 132 | static int __init random32_reseed(void) |
| 133 | { | 133 | { |