Merge branch 'master' into percpu

Conflicts:
	arch/powerpc/platforms/pseries/hvCall.S
	include/linux/percpu.h

diff --cc arch/blackfin/mach-common/entry.S
Simple merge

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

diff --cc arch/x86/kernel/apic/nmi.c
Simple merge

diff --cc arch/x86/kernel/head_32.S
Simple merge

diff --cc arch/x86/kernel/vmlinux.lds.S
Simple merge

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

diff --cc include/linux/percpu.h
index 42878f0,cf5efbc..a93e5bf
--- 1/include/linux/percpu.h
--- 2/include/linux/percpu.h
+++ b/include/linux/percpu.h
@@@ -134,9 -127,10 +134,10 @@@ extern int __init pcpu_page_first_chunk
   */
  #define per_cpu_ptr(ptr, cpu) SHIFT_PERCPU_PTR((ptr), per_cpu_offset((cpu)))
  
 -extern void *__alloc_reserved_percpu(size_t size, size_t align);
 -extern void *__alloc_percpu(size_t size, size_t align);
 -extern void free_percpu(void *__pdata);
 +extern void __percpu *__alloc_reserved_percpu(size_t size, size_t align);
 +extern void __percpu *__alloc_percpu(size_t size, size_t align);
 +extern void free_percpu(void __percpu *__pdata);
+ extern phys_addr_t per_cpu_ptr_to_phys(void *addr);
  
  #ifndef CONFIG_HAVE_SETUP_PER_CPU_AREA
  extern void __init setup_per_cpu_areas(void);

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

diff --cc kernel/rcutorture.c
Simple merge

diff --cc kernel/trace/trace.c
Simple merge

diff --cc kernel/trace/trace_functions_graph.c
Simple merge

diff --cc mm/percpu.c
Simple merge