From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 7 Jan 2012 02:15:25 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur... 
X-Git-Tag: v3.12-rc1~4154
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=770e1b035dcb6ec3f8ee69dda0815dd1e220a683;p=kernel%2Fkernel-generic.git

Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm

* 'for-linus' of git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm: (207 commits)
  ARM: 7267/1: Remove BUILD_BUG_ON from asm/bug.h
  ARM: 7269/1: mach-sa1100: fix sched_clock breakage
  ARM: 7198/1: arm/imx6: add restart support for imx6q
  ARM: restart: remove the now empty arch_reset()
  ARM: restart: remove comments about adding code to arch_reset()
  ARM: restart: lpc32xx & u300: remove unnecessary printk
  ARM: restart: plat-samsung: remove plat/reset.h and s5p_reset_hook
  ARM: restart: w90x900: use new restart hook
  ARM: restart: Versatile Express: use new restart hook
  ARM: restart: versatile: use new restart hook
  ARM: restart: u300: use new restart hook
  ARM: restart: tegra: use new restart hook
  ARM: restart: spear: use new restart hook
  ARM: restart: shark: use new restart hook
  ARM: restart: sa1100: use new restart hook
  ARM: 7252/1: restart: S5PV210: use new restart hook
  ARM: 7251/1: restart: S5PC100: use new restart hook
  ARM: 7250/1: restart: S5P64X0: use new restart hook
  ARM: 7266/1: restart: S3C64XX: use new restart hook
  ARM: 7265/1: restart: S3C24XX: use new restart hook
  ...

Fix up trivial conflict in arch/arm/mm/init.c due to removal of
memblock_init() clashing with the movement of the sorting of the meminfo
array.
---

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