diff options
| author | Len Brown <len.brown@intel.com> | 2010-08-15 01:06:31 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-08-15 01:06:31 -0400 |
| commit | 95ee46aa8698f2000647dfb362400fadbb5807cf (patch) | |
| tree | e5a05c7297f997e191c73091934e42e3195c0e40 /lib/random32.c | |
| parent | cfa806f059801dbe7e435745eb2e187c8bfe1e7f (diff) | |
| parent | 92fa5bd9a946b6e7aab6764e7312e4e3d9bed295 (diff) | |
Merge branch 'linus' into release
Conflicts:
drivers/acpi/debug.c
Signed-off-by: Len Brown <len.brown@intel.com>
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 | { |