diff options
author | Ingo Molnar <mingo@kernel.org> | 2014-06-05 11:18:03 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2014-06-05 12:26:27 +0200 |
commit | c56d34064b6eb9f9cde9e35bbfe16eedf3d81f94 (patch) | |
tree | 9877ef9e1b238e14a1878f10d51ea55fbca5f619 /arch/x86/lib/thunk_32.S | |
parent | Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
parent | Merge branch 'uprobes/core' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
download | linux-c56d34064b6eb9f9cde9e35bbfe16eedf3d81f94.tar.xz linux-c56d34064b6eb9f9cde9e35bbfe16eedf3d81f94.zip |
Merge branch 'perf/uprobes' into perf/core
These bits from Oleg are fully cooked, ship them to Linus.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/lib/thunk_32.S')
0 files changed, 0 insertions, 0 deletions