From: Thomas Gleixner <tglx@linutronix.de>
Date: Mon, 14 May 2007 09:10:02 +0000 (+0200)
Subject: timekeeping fix patch got mis-applied
X-Git-Tag: v2.6.22-rc2~114
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d10ff3fb62bd38415c0f7be3d75d107e1f67e59a;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed