Merge branch 'master' into percpu
authorTejun Heo <tj@kernel.org>
Tue, 2 Feb 2010 05:38:15 +0000 (14:38 +0900)
committerTejun Heo <tj@kernel.org>
Tue, 2 Feb 2010 05:38:15 +0000 (14:38 +0900)
commitab386128f20c44c458a90039ab1bdc265ac474c9
tree2ad188744922b1bb951fd10ff50dc04c83acce22
parentdbfc196a3cc1a2514ad0737a82f764de23bd65e6
parentab658321f32770b903a4426e2a6fae0392757755
Merge branch 'master' into percpu
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