summaryrefslogtreecommitdiff
path: root/kernel/trace/trace_uprobe.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2012-07-18 09:17:17 (GMT)
committerIngo Molnar <mingo@kernel.org>2012-07-18 09:17:17 (GMT)
commita2fe194723f6e4990d01d8c208c7b138fd410522 (patch)
tree7aee93fa8f4ba1e18b56fa7d8eab75d249fc6966 /kernel/trace/trace_uprobe.c
parentc3b7cdf180090d2686239a75bb0ae408108ed749 (diff)
parenta018540141a931f5299a866907b27886916b4374 (diff)
downloadlinux-fsl-qoriq-a2fe194723f6e4990d01d8c208c7b138fd410522.tar.xz
Merge branch 'linus' into perf/core
Pick up the latest ring-buffer fixes, before applying a new fix. Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/trace/trace_uprobe.c')
0 files changed, 0 insertions, 0 deletions