tree add380154271f9a68be4099590f912b4ab4bed9f
parent b5210b2a34bae35fc00675462333af45676d727c
parent f1923820c447e986a9da0fc6bf60c1dccdf0408e
author Ingo Molnar <mingo@kernel.org> 1366534653 +0200
committer Ingo Molnar <mingo@kernel.org> 1366534653 +0200

Merge branch 'perf/urgent' into perf/core

Conflicts:
	arch/x86/kernel/cpu/perf_event_intel.c

Merge in the latest fixes before applying new patches, resolve the conflict.

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