Merge remote-tracking branch 'tip/auto-latest'

Conflicts:
	arch/arm/kernel/Makefile
	kernel/futex.c

diff --cc Documentation/kernel-per-CPU-kthreads.txt
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/kernel/Makefile
index fccfbdb03df183d840d5a4f1191606df243d05d8,97cb0576d07c3977adf4b4e94807a34e6477d03f..86d10dd47dc46b52328436fbfee0baf88cbc87fc
--- 1/arch/arm/kernel/Makefile
--- 2/arch/arm/kernel/Makefile
+++ b/arch/arm/kernel/Makefile
@@@ -15,8 -15,8 +15,8 @@@ CFLAGS_REMOVE_return_address.o = -p
  
  # Object file lists.
  
 -obj-y         := elf.o entry-armv.o entry-common.o irq.o opcodes.o \
 +obj-y         := elf.o entry-common.o irq.o opcodes.o \
-                  process.o ptrace.o return_address.o sched_clock.o \
+                  process.o ptrace.o return_address.o \
                   setup.o signal.o stacktrace.o sys_arm.o time.o traps.o
  
  obj-$(CONFIG_ATAGS)           += atags_parse.o

diff --cc arch/arm/mach-ixp4xx/common.c
Simple merge

diff --cc arch/mips/kernel/scall32-o32.S
Simple merge

diff --cc arch/x86/include/asm/mce.h
Simple merge

diff --cc arch/x86/kernel/cpu/mcheck/therm_throt.c
Simple merge

diff --cc arch/x86/kernel/cpu/mtrr/main.c
Simple merge

diff --cc drivers/mfd/twl4030-irq.c
Simple merge

diff --cc fs/exec.c
Simple merge

diff --cc include/linux/kernel.h
Simple merge

diff --cc include/linux/ktime.h
index b4fa5e4cd158dfa5e8bdda0c9e14df77818abe65,fc66b301b6480a03278ffd1b1a881d6c784a00a6..debf208b7611ea004537ae284b8436eccd9e7aa2
--- 1/include/linux/ktime.h
--- 2/include/linux/ktime.h
+++ b/include/linux/ktime.h
@@@ -320,17 -321,12 +321,17 @@@ static inline s64 ktime_us_delta(const 
  
  static inline ktime_t ktime_add_us(const ktime_t kt, const u64 usec)
  {
-       return ktime_add_ns(kt, usec * 1000);
+       return ktime_add_ns(kt, usec * NSEC_PER_USEC);
  }
  
 +static inline ktime_t ktime_add_ms(const ktime_t kt, const u64 msec)
 +{
 +      return ktime_add_ns(kt, msec * NSEC_PER_MSEC);
 +}
 +
  static inline ktime_t ktime_sub_us(const ktime_t kt, const u64 usec)
  {
-       return ktime_sub_ns(kt, usec * 1000);
+       return ktime_sub_ns(kt, usec * NSEC_PER_USEC);
  }
  
  extern ktime_t ktime_add_safe(const ktime_t lhs, const ktime_t rhs);

diff --cc include/linux/sched.h
Simple merge

diff --cc kernel/cpuset.c
Simple merge

diff --cc kernel/irq/generic-chip.c
Simple merge

diff --cc kernel/irq/irqdomain.c
Simple merge