Ingo Molnar 83bc90e115 Merge branch 'linus' into perf/core, to fix conflicts ...

Conflicts:
	arch/x86/kernel/cpu/perf_event_intel_uncore*.c

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

2014-08-24 22:32:24 +02:00

..

asm

Merge branch 'linus' into perf/core, to fix conflicts

2014-08-24 22:32:24 +02:00

uapi/asm

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux

2014-08-16 09:25:34 -06:00