tree 021cc9f6b477146fcebe6f3be4752abfa2ba18a9
parent 682968e0c425c60f0dde37977e5beb2b12ddc4cc
parent a385ec4f11bdcf81af094c03e2444ee9b7fad2e5
author Ingo Molnar <mingo@kernel.org> 1334402307 +0200
committer Ingo Molnar <mingo@kernel.org> 1334402344 +0200

Merge branch 'perf/core' into perf/uprobes

Merge in latest upstream (and the latest perf development tree),
to prepare for tooling changes, and also to pick up v3.4 MM
changes that the uprobes code needs to take care of.

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