Merge git://git.kernel.org/pub/scm/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>

diff --cc arch/sparc/kernel/leon_smp.c
index 6173f4d82dedaaa859442b04eb8c078909b72878,160cac9c403654043269e0a63123ecf3ee3bd0a6..356dfc45cdd071fb965e1364f4d64f7ce7445637
--- 1/arch/sparc/kernel/leon_smp.c
--- 2/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);