Ingo Molnar a3d06cc6aa Merge branch 'linus' into perfcounters/core ... Conflicts: arch/x86/include/asm/kmap_types.h include/linux/mm.h include/asm-generic/kmap_types.h Merge reason: We crossed changes with kmap_types.h cleanups in mainline. Signed-off-by: Ingo Molnar <mingo@elte.hu>		2009-06-17 13:06:17 +02:00
..
cpufreq	CPUFREQ: Mark e_powersaver driver as EXPERIMENTAL and DANGEROUS	2009-06-10 15:22:44 -07:00
mcheck	Merge branch 'linus' into x86/mce3	2009-06-11 23:31:52 +02:00
mtrr	Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-06-10 15:49:36 -07:00
.gitignore
addon_cpuid_features.c	x86 ACPI: Add support for Always Running APIC timer	2009-04-07 18:17:51 -04:00
amd.c	Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-06-10 16:15:14 -07:00
bugs.c
bugs_64.c
centaur.c	x86/centaur: merge 32 & 64 bit version	2009-03-14 16:27:29 +01:00
cmpxchg.c
common.c	use printk_once() in several places	2009-06-16 19:47:50 -07:00
cpu.h	x86: cpu/cpu.h cleanup	2009-03-23 02:06:51 +05:30
cpu_debug.c	Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-06-10 15:51:15 -07:00
cyrix.c
hypervisor.c
intel.c	x86: add hooks for kmemcheck	2009-06-15 12:40:02 +02:00
intel_cacheinfo.c	x86: cacheinfo: complete L2/L3 Cache and TLB associativity field definitions	2009-04-10 15:41:18 +02:00
Makefile	Merge branch 'linus' into perfcounters/core-v2	2009-04-06 09:02:57 +02:00
mkcapflags.pl
perf_counter.c	perf_counter: x86: Fix call-chain support to use NMI-safe methods	2009-06-15 15:57:53 +02:00
perfctr-watchdog.c
powerflags.c
proc.c	x86: show number of core_siblings instead of thread_siblings in /proc/cpuinfo	2009-05-04 20:36:49 +02:00
transmeta.c
umc.c
vmware.c