Merge branch 'master' into percpu

diff --cc arch/sparc/kernel/nmi.c
Simple merge

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

diff --cc kernel/module.c
Simple merge

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

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

diff --cc mm/page_alloc.c
Simple merge

diff --cc mm/percpu.c
Simple merge