diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2007-05-14 11:10:02 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-14 21:13:11 +0200 |
commit | d10ff3fb62bd38415c0f7be3d75d107e1f67e59a (patch) | |
tree | 402df109059cb64f88fb26c0cf5eb86b8c9fdae3 /security/root_plug.c | |
parent | fix deadlock in loop.c (diff) | |
download | linux-d10ff3fb62bd38415c0f7be3d75d107e1f67e59a.tar.xz linux-d10ff3fb62bd38415c0f7be3d75d107e1f67e59a.zip |
timekeeping fix patch got mis-applied
The time keeping code move to kernel/time/timekeeping.c broke the
clocksource resume logic patch, which got applied to the old file by a
fuzzy application. Fix it up and move the clocksource_resume() call to
the appropriate place.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
[ tssk, tssk, everybody should use --fuzz=0 ]
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'security/root_plug.c')
0 files changed, 0 insertions, 0 deletions