]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
Merge commit 'v2.6.28-rc7'; branch 'x86/dumpstack' into tracing/ftrace
authorIngo Molnar <mingo@elte.hu>
Wed, 3 Dec 2008 07:54:47 +0000 (08:54 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 3 Dec 2008 07:55:34 +0000 (08:55 +0100)
commitdfdc5437bd62dd6a26961e27f26b671374749875
tree730ddeccfc74ca11b738a69e4d96644bc047e946
parentf0461d0146ee30927bc7efa2ae24ea8c6693b725
parent061e41fdb5047b1fb161e89664057835935ca1d2
parent878719e831d9e076961aa15d4049a57a6668c67a
Merge commit 'v2.6.28-rc7'; branch 'x86/dumpstack' into tracing/ftrace

Merge x86/dumpstack into tracing/ftrace because upcoming ftrace changes
depend on cleanups already in x86/dumpstack.

Also merge to latest upstream -rc.
arch/powerpc/kernel/entry_64.S
arch/x86/kernel/Makefile
arch/x86/mm/fault.c
include/linux/sched.h
kernel/profile.c
kernel/sched.c
kernel/sysctl.c