Merge branch 'linus' into x86/urgent

Merge reason: pull in latest to fix a bug in it.

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

diff --combined arch/x86/include/asm/atomic_32.h
index a6a4b357076d92056e9a4071210fff75878ee22e,8cb9c814e1203a0b7434018392e2ee01ef3ca199..2503d4e64c2a79a2aab7618e9c325aadb428e74d
--- 1/arch/x86/include/asm/atomic_32.h
--- 2/arch/x86/include/asm/atomic_32.h
+++ b/arch/x86/include/asm/atomic_32.h
@@@ -257,7 -257,7 +257,7 @@@ typedef struct 
  
  /**
   * atomic64_read - read atomic64 variable
 - * @v: pointer of type atomic64_t
 + * @ptr: pointer of type atomic64_t
   *
   * Atomically reads the value of @v.
   * Doesn't imply a read memory barrier.
@@@ -294,6 -294,7 +294,6 @@@ atomic64_cmpxchg(atomic64_t *ptr, unsig
   * atomic64_xchg - xchg atomic64 variable
   * @ptr:      pointer to type atomic64_t
   * @new_val:  value to assign
 - * @old_val:  old value that was there
   *
   * Atomically xchgs the value of @ptr to @new_val and returns
   * the old value.
@@@ -482,5 -483,5 +482,5 @@@ atomic64_add_negative(unsigned long lon
        return old_val < 0;
  }
  
- #include <asm-generic/atomic.h>
+ #include <asm-generic/atomic-long.h>
  #endif /* _ASM_X86_ATOMIC_32_H */