Commit 83bc90e1 authored Aug 24, 2014 by Ingo Molnar

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>

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Please register or to comment