Merge commit 'v2.6.35-rc4' into perf/core

Merge reason: Pick up the latest perf fixes

Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --cc MAINTAINERS
Simple merge

diff --cc Makefile
Simple merge

diff --cc arch/arm/kernel/perf_event.c
index 5b7cfafc0720550e7bab62eb9d1ab2e912029fb4,de12536d687f69a6fa246038afe9754936d223d9..417c392ddf1cb55066fa5f99e83e77514bd89901
--- 1/arch/arm/kernel/perf_event.c
--- 2/arch/arm/kernel/perf_event.c
+++ b/arch/arm/kernel/perf_event.c
@@@ -201,13 -201,13 +201,13 @@@ armpmu_event_update(struct perf_event *
  {
        int shift = 64 - 32;
        s64 prev_raw_count, new_raw_count;
-       s64 delta;
+       u64 delta;
  
  again:
 -      prev_raw_count = atomic64_read(&hwc->prev_count);
 +      prev_raw_count = local64_read(&hwc->prev_count);
        new_raw_count = armpmu->read_counter(idx);
  
 -      if (atomic64_cmpxchg(&hwc->prev_count, prev_raw_count,
 +      if (local64_cmpxchg(&hwc->prev_count, prev_raw_count,
                             new_raw_count) != prev_raw_count)
                goto again;
  

diff --cc init/main.c
Simple merge

diff --cc kernel/sched.c
Simple merge

diff --cc scripts/package/Makefile
Simple merge