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

Conflicts:
	arch/arm/mm/init.c
	arch/powerpc/include/asm/cputime.h

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc arch/arm/kernel/process.c
Simple merge

diff --cc arch/arm/kernel/setup.c
Simple merge

diff --cc arch/arm/mm/init.c
index 786adddf1a86c70cd1087a7341c79b49bf03ca6b,7c38474e533a47c63ac4b78a698f245457a1b7de..e34ea8adc1f928fe8ebeadc677aba06fbd8b4f47
--- 1/arch/arm/mm/init.c
--- 2/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@@ -310,7 -331,8 +311,6 @@@ void __init arm_memblock_init(struct me
  {
        int i;
  
-       memblock_init();
 -      sort(&meminfo.bank, meminfo.nr_banks, sizeof(meminfo.bank[0]), meminfo_cmp, NULL);
 -
        for (i = 0; i < mi->nr_banks; i++)
                memblock_add(mi->bank[i].start, mi->bank[i].size);
  

diff --cc arch/mips/Kconfig
Simple merge

diff --cc arch/mips/kernel/setup.c
Simple merge

diff --cc arch/powerpc/Kconfig
Simple merge

diff --cc arch/powerpc/include/asm/cputime.h
index 33a35801f7c9bc77d15ac9c6cde1cb126b6ce08f,e94935c520197d2d13af1eff0e8b149d4ad9b274..6860ed9851509547e929d575a5f77b216d0906f4
--- 1/arch/powerpc/include/asm/cputime.h
--- 2/arch/powerpc/include/asm/cputime.h
+++ b/arch/powerpc/include/asm/cputime.h
@@@ -130,7 -114,7 +114,7 @@@ extern u64 __cputime_usec_factor
  
  static inline unsigned long cputime_to_usecs(const cputime_t ct)
  {
-       return mulhdu(ct, __cputime_usec_factor);
 -      return mulhdu((__force u64) ct, __cputime_msec_factor) * USEC_PER_MSEC;
++      return mulhdu((__force u64) ct, __cputime_usec_factor);
  }
  
  static inline cputime_t usecs_to_cputime(const unsigned long us)

diff --cc arch/powerpc/kernel/idle.c
Simple merge

diff --cc arch/powerpc/kernel/machine_kexec.c
Simple merge

diff --cc arch/powerpc/mm/init_32.c
Simple merge

diff --cc arch/powerpc/mm/mem.c
Simple merge

diff --cc arch/powerpc/mm/numa.c
Simple merge

diff --cc arch/powerpc/mm/tlb_nohash.c
Simple merge

diff --cc arch/s390/Kconfig
Simple merge

diff --cc arch/s390/kernel/setup.c
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

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

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

diff --cc drivers/cpufreq/cpufreq_ondemand.c
Simple merge

diff --cc drivers/iommu/intel-iommu.c
Simple merge

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

diff --cc init/Kconfig
Simple merge

diff --cc kernel/cpu.c
Simple merge

diff --cc kernel/exit.c
Simple merge

diff --cc kernel/fork.c
Simple merge

diff --cc mm/page_alloc.c
Simple merge