Ingo Molnar 73e21ce28d 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>

2013-04-21 10:57:33 +02:00

..

asm

Merge branch 'perf/urgent' into perf/core

2013-04-21 10:57:33 +02:00

uapi/asm

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

2013-04-08 11:43:30 +02:00