diff options
author | Ingo Molnar <mingo@elte.hu> | 2010-04-21 07:47:00 (GMT) |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2010-04-21 07:47:05 (GMT) |
commit | ac0053fd51d2bac09a7d4b4a59f6dac863bd4373 (patch) | |
tree | 00c32e14428853f352fa3828d0131653ad6a7c69 /include/linux/ftrace.h | |
parent | b15c7b1cee119999e9eafcd602d24a595e77adac (diff) | |
parent | 01bf0b64579ead8a82e7cfc32ae44bc667e7ad0f (diff) | |
download | linux-fsl-qoriq-ac0053fd51d2bac09a7d4b4a59f6dac863bd4373.tar.xz |
Merge commit 'v2.6.34-rc5' into tracing/core
Merge reason: pick up latest -rc's.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux/ftrace.h')
0 files changed, 0 insertions, 0 deletions