From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 21 Dec 2011 03:55:11 +0000 (+1100)
Subject: Merge remote-tracking branch 'tip/auto-latest'
X-Git-Tag: next-20111221~28
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=97239208e52a6dd274bc7cab49befeefc4fdbdf3;p=karo-tx-linux.git

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

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

97239208e52a6dd274bc7cab49befeefc4fdbdf3
diff --cc arch/arm/mm/init.c
index 786adddf1a86,7c38474e533a..e34ea8adc1f9
--- a/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/powerpc/include/asm/cputime.h
index 33a35801f7c9,e94935c52019..6860ed985150
--- a/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)