diff options
| author | Ingo Molnar <[email protected]> | 2012-01-27 11:01:41 +0000 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2012-01-27 11:01:43 +0000 |
| commit | 801493c2e249a7314e9e8e54ad60d613d0a86f14 (patch) | |
| tree | c8f77ce14e76abec848366812a0aad0fad4f539c /tools/perf/builtin-script.c | |
| parent | Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| parent | Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| download | kernel-801493c2e249a7314e9e8e54ad60d613d0a86f14.tar.gz kernel-801493c2e249a7314e9e8e54ad60d613d0a86f14.zip | |
Merge branch 'linus' into perf/core
Merge reason: pick up fixes that are upstream, we need them
because we'll apply dependent patches.
Signed-off-by: Ingo Molnar <[email protected]>
Diffstat (limited to 'tools/perf/builtin-script.c')
0 files changed, 0 insertions, 0 deletions