tree f03743d576a0c7826b9921ad47e70370ebe80a22
parent ec83db0f78cd44c3b586ec1c3a348d1a8a389797
parent 73eff9f56e15598c8399c0b86899fd889b97f085
author Ingo Molnar <mingo@kernel.org> 1336999420 +0200
committer Ingo Molnar <mingo@kernel.org> 1336999420 +0200

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