tree cd7986275c7451a9a23d526b880a66de6f110326
parent a05123bdd1b9ba961ed262864924a5b3ee81afe8
parent 44009105081b51417f311f4c3be0061870b6b8ed
author Ingo Molnar <mingo@kernel.org> 1350835880 +0200
committer Ingo Molnar <mingo@kernel.org> 1350835880 +0200

Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into perf/urgent

Pull event-wrapping Oprofile fix from Robert Richter.

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