git.openwrt.org Git - openwrt/staging/blogic.git/commit

projects / openwrt / staging / blogic.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 22b737f c5974b8)

author	Tejun Heo <tj@kernel.org>
	Tue, 5 Jan 2010 00:17:33 +0000 (09:17 +0900)
committer	Tejun Heo <tj@kernel.org>
	Tue, 5 Jan 2010 00:17:33 +0000 (09:17 +0900)
commit	32032df6c2f6c9c6b2ada2ce42322231824f70c2
tree	b1ce838a37044bb38dfc128e2116ca35630e629a	tree \| snapshot
parent	22b737f4c75197372d64afc6ed1bccd58c00e549	commit \| diff
parent	c5974b835a909ff15c3b7e6cf6789b5eb919f419	commit \| diff

Merge branch 'master' into percpu

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

12 files changed:

arch/blackfin/mach-common/entry.S	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/system.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/apic/nmi.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/head_32.S	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/vmlinux.lds.S	diff1 \|	diff2 \|	blob \| history
include/linux/compiler.h	diff1 \|	diff2 \|	blob \| history
include/linux/percpu.h	diff1 \|	diff2 \|	blob \| history
include/linux/vmstat.h	diff1 \|	diff2 \|	blob \| history
kernel/rcutorture.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace_functions_graph.c	diff1 \|	diff2 \|	blob \| history
mm/percpu.c	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree