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

diff --combined kernel/time/timekeeping.c
index e97c50f8458b5be51970bd8e3cc9f3b465923eb5,52a8bf8931f3903128af16a13d32c5d4b8b376aa..e8c77d9c633acbffc4872b8d0c4b8a9929d399c2
--- 1/kernel/time/timekeeping.c
--- 2/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@@ -22,7 -22,7 +22,7 @@@
  
  /*
   * This read-write spinlock protects us from races in SMP while
-  * playing with xtime and avenrun.
+  * playing with xtime.
   */
  __cacheline_aligned_in_smp DEFINE_SEQLOCK(xtime_lock);
  
@@@ -77,10 -77,6 +77,10 @@@ static void clocksource_forward_now(voi
        clock->cycle_last = cycle_now;
  
        nsec = cyc2ns(clock, cycle_delta);
 +
 +      /* If arch requires, add in gettimeoffset() */
 +      nsec += arch_gettimeoffset();
 +
        timespec_add_ns(&xtime, nsec);
  
        nsec = ((s64)cycle_delta * clock->mult_orig) >> clock->shift;
@@@ -115,9 -111,6 +115,9 @@@ void getnstimeofday(struct timespec *ts
                /* convert to nanoseconds: */
                nsecs = cyc2ns(clock, cycle_delta);
  
 +              /* If arch requires, add in gettimeoffset() */
 +              nsecs += arch_gettimeoffset();
 +
        } while (read_seqretry(&xtime_lock, seq));
  
        timespec_add_ns(ts, nsecs);