Merge branches 'tracing/ftrace' and 'linus' into tracing/core
authorIngo Molnar <mingo@elte.hu>
Fri, 27 Feb 2009 08:04:43 +0000 (09:04 +0100)
committerIngo Molnar <mingo@elte.hu>
Fri, 27 Feb 2009 08:04:43 +0000 (09:04 +0100)
commitf701d354075914296474d062f18fc8ee681a2318
tree4c39db49f4bc9827a1a0dabc6a83fb30bd2c7ac4
parent1b49061d400c9e51e3ac2aac026a099fe599b9bb
parent64e71303e44f3697e4568147caa966de74bdb4fb
Merge branches 'tracing/ftrace' and 'linus' into tracing/core
Documentation/kernel-parameters.txt
arch/ia64/Kconfig