diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-11-11 09:58:36 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-11-11 09:58:36 +0100 |
commit | d844222a54c33a960755b44b934cd1b01b05dceb (patch) | |
tree | 3ed56e3969ef2f1cccc921f3c49a959012ba1bda /arch/x86/kernel/Makefile | |
parent | f536aafc5a2e6f0c8f1577a155e6f93db5e469f0 (diff) | |
download | linux-d844222a54c33a960755b44b934cd1b01b05dceb.tar.gz linux-d844222a54c33a960755b44b934cd1b01b05dceb.tar.bz2 linux-d844222a54c33a960755b44b934cd1b01b05dceb.zip |
Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/core
Diffstat (limited to 'arch/x86/kernel/Makefile')
0 files changed, 0 insertions, 0 deletions