tree c51c8fd808e6cff15cabb1a9ac29be0661942384
parent b847d0501afec4c7b12eb276aec10a2834f953ea
parent 23995bbee01d75f09f72b1380bd6045a5b02947b
author Ingo Molnar <mingo@kernel.org> 1365414210 +0200
committer Ingo Molnar <mingo@kernel.org> 1365414210 +0200

Merge branch 'for-tip' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into perf/core

Pull IBM zEnterprise EC12 support patchlet from Robert Richter.

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