Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:
	Documentation/feature-removal-schedule.txt
	drivers/scsi/fcoe/fcoe.c
	net/core/drop_monitor.c
	net/core/net-traces.c

1 files changed, 9 insertions, 1 deletions

diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h
index 5a40d14daa9f..c56457c8334e 100644
--- a/include/linux/clocksource.h
+++ b/include/linux/clocksource.h
@@ -288,7 +288,15 @@ static inline cycle_t clocksource_read(struct clocksource *cs)
  */
 static inline int clocksource_enable(struct clocksource *cs)
 {
-        return cs->enable ? cs->enable(cs) : 0;
+        int ret = 0;
+
+        if (cs->enable)
+                ret = cs->enable(cs);
+
+        /* save mult_orig on enable */
+        cs->mult_orig = cs->mult;
+
+        return ret;
 }
 
 /**