Merge branch 'master' into percpu
Tejun Heo [Tue, 2 Feb 2010 05:38:15 +0000 (14:38 +0900)]
1  2 
arch/sparc/kernel/nmi.c
include/linux/mm.h
kernel/module.c
kernel/trace/ring_buffer.c
kernel/trace/trace.c
mm/page_alloc.c
mm/percpu.c

Simple merge
Simple merge
diff --cc kernel/module.c
Simple merge
Simple merge
Simple merge
diff --cc mm/page_alloc.c
Simple merge
diff --cc mm/percpu.c
Simple merge