Merge commit 'v2.6.35-rc3' into sched/core

Merge reason: Update to the latest -rc.

diff --combined kernel/perf_event.c
index 109c5ec88933aabf389da35cf544943cfbea685f,ff86c558af4c28dd4c9a7ea92cc592b70bee6d7d..7e32b51ff043b9a7fb47ef17aed2aef295d3de66
--- 1/kernel/perf_event.c
--- 2/kernel/perf_event.c
+++ b/kernel/perf_event.c
@@@ -214,7 -214,7 +214,7 @@@ static void perf_unpin_context(struct p
  
  static inline u64 perf_clock(void)
  {
 -      return cpu_clock(raw_smp_processor_id());
 +      return local_clock();
  }
  
  /*
@@@ -1507,6 -1507,9 +1507,9 @@@ do {                                    
                divisor = nsec * frequency;
        }
  
+       if (!divisor)
+               return dividend;
+ 
        return div64_u64(dividend, divisor);
  }
  
@@@ -1529,7 -1532,7 +1532,7 @@@ static int perf_event_start(struct perf
  static void perf_adjust_period(struct perf_event *event, u64 nsec, u64 count)
  {
        struct hw_perf_event *hwc = &event->hw;
-       u64 period, sample_period;
+       s64 period, sample_period;
        s64 delta;
  
        period = perf_calculate_period(event, nsec, count);