aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/mm
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-12-03 02:54:47 -0500
committerIngo Molnar <mingo@elte.hu>2008-12-03 02:55:34 -0500
commitdfdc5437bd62dd6a26961e27f26b671374749875 (patch)
tree730ddeccfc74ca11b738a69e4d96644bc047e946 /arch/x86/mm
parentf0461d0146ee30927bc7efa2ae24ea8c6693b725 (diff)
parent061e41fdb5047b1fb161e89664057835935ca1d2 (diff)
parent878719e831d9e076961aa15d4049a57a6668c67a (diff)
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.