Merge branches 'tracing/ftrace' and 'linus' into tracing/core
authorIngo Molnar <mingo@elte.hu>
Wed, 18 Mar 2009 05:58:45 +0000 (06:58 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 18 Mar 2009 05:58:45 +0000 (06:58 +0100)
commit03418c7efaa429dc7647ac93e3862e3fe1816873
treed5a101034139f846b700dfdf53eb6737ea6c4365
parent4176935b58eeb636917e65a2c388e4607e36cce6
parentee568b25ee9e160b32d1aef73d8b2ee9c05d34db
Merge branches 'tracing/ftrace' and 'linus' into tracing/core
MAINTAINERS
arch/x86/kernel/tsc.c
drivers/acpi/osl.c