From: David S. Miller <davem@davemloft.net>
Date: Fri, 27 Apr 2012 03:00:35 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
X-Git-Tag: upstream/snapshot3+hdmi~7484^2~104
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8fe5f56c8a203a7a83d1b621c369655d914f3752;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge git://git./linux/kernel/git/torvalds/linux

Conflicts:
	arch/sparc/kernel/leon_smp.c

Merge mainline to get the nobootmem.c bug fix, for the sake
of the sparc64 NO_BOOTMEM conversion.

Resolve a small include line conflict in leon_smp.c

Signed-off-by: David S. Miller <davem@davemloft.net>
---

8fe5f56c8a203a7a83d1b621c369655d914f3752
diff --cc arch/sparc/kernel/leon_smp.c
index 6173f4d,160cac9..356dfc4
--- a/arch/sparc/kernel/leon_smp.c
+++ b/arch/sparc/kernel/leon_smp.c
@@@ -78,9 -78,11 +78,11 @@@ void __cpuinit leon_callin(void
  	local_flush_cache_all();
  	local_flush_tlb_all();
  	leon_configure_cache_smp();
+ 
+ 	notify_cpu_starting(cpuid);
  
  	/* Get our local ticker going. */
 -	smp_setup_percpu_timer();
 +	register_percpu_ce(cpuid);
  
  	calibrate_delay();
  	smp_store_cpu_info(cpuid);