tree 43f67fb370571aedb0ec8a1ad7e8da61834d19b2
parent f8378f5259647710f0b4ecb814b0a1b0d9040de0
parent 515619f209114697fabd21eed1623bfa69746815
author Ingo Molnar <mingo@kernel.org> 1366103050 +0200
committer Ingo Molnar <mingo@kernel.org> 1366103050 +0200

Merge branch 'uprobes/core' of git://git.kernel.org/pub/scm/linux/kernel/git/oleg/misc into perf/core

Pull uprobes updates from Oleg Nesterov:

 - "uretprobes" - an optimization to uprobes, like kretprobes are an optimization
   to kprobes. "perf probe -x file sym%return" now works like kretprobes.

 - PowerPC fixes plus a couple of cleanups/optimizations in uprobes and trace_uprobes.

Signed-off-by: Ingo Molnar <mingo@kernel.org>