Thomas Gleixner 7ce7f35b33 Merge branch 'x86/cpufeature' into x86/cache ... Resolve the cpu/scattered conflict. Signed-off-by: Thomas Gleixner <tglx@linutronix.de>		2016-11-16 14:19:34 +01:00
..
amd	perf/x86/amd: Make HW_CACHE_REFERENCES and HW_CACHE_MISSES measure L2	2016-09-16 16:19:49 +02:00
intel	Merge branch 'x86/cpufeature' into x86/cache	2016-11-16 14:19:34 +01:00
core.c	Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2016-10-03 16:13:28 -07:00
Kconfig	perf/x86: Move Kconfig.perf and other perf configuration bits to events/Kconfig	2016-03-31 10:30:40 +02:00
Makefile	x86/perf/intel/uncore: Make the Intel uncore PMU driver modular	2016-03-31 10:30:34 +02:00
msr.c	Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2016-07-30 12:56:26 -07:00
perf_event.h	perf/x86/intel: Clean up LBR state tracking	2016-08-10 13:13:27 +02:00