]> err.no Git - linux-2.6/commit
projects / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 705962c) | patch
timekeeping fix patch got mis-applied
authorThomas Gleixner <tglx@linutronix.de>
Mon, 14 May 2007 09:10:02 +0000 (11:10 +0200)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 14 May 2007 19:13:11 +0000 (12:13 -0700)
commitd10ff3fb62bd38415c0f7be3d75d107e1f67e59a
tree402df109059cb64f88fb26c0cf5eb86b8c9fdae3tree | snapshot
parent705962ccc9d21a08b74b6b6e1d3cf10f98968a67commit | diff
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>
kernel/time/timekeeping.c diff | blob | history
kernel/timer.c diff | blob | history
Linux 2.6 source tree