Merge branches 'tracing/ftrace', 'tracing/mmiotrace' and 'linus' into tracing/core
authorIngo Molnar <mingo@elte.hu>
Mon, 2 Mar 2009 21:37:35 +0000 (22:37 +0100)
committerIngo Molnar <mingo@elte.hu>
Mon, 2 Mar 2009 21:37:35 +0000 (22:37 +0100)
commitfdfa66ab455c79d699833c43ac0e09900133fd7c
tree5ede20eaf13eab51c3a391e002a4e9988aa3e787
parent4387d6d6b8a74722bf1f6fc3e29dd2a84cc1d1c2
parentacdb2c287916ce247c09d460266370af45da55c5
parent340430c572f7b2b275d39965e88bafa71693cb23
Merge branches 'tracing/ftrace', 'tracing/mmiotrace' and 'linus' into tracing/core
Documentation/kernel-parameters.txt
arch/x86/Kconfig