Linus Torvalds 5b34653963 Merge branch 'x86/um-header' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip ... * 'x86/um-header' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (26 commits) x86: canonicalize remaining header guards x86: drop double underscores from header guards x86: Fix ASM_X86__ header guards x86, um: get rid of uml-config.h x86, um: get rid of arch/um/Kconfig.arch x86, um: get rid of arch/um/os symlink x86, um: get rid of excessive includes of uml-config.h x86, um: get rid of header symlinks x86, um: merge Kconfig.i386 and Kconfig.x86_64 x86, um: get rid of sysdep symlink x86, um: trim the junk from uml ptrace-*.h x86, um: take vm-flags.h to sysdep x86, um: get rid of uml asm/arch x86, um: get rid of uml highmem.h x86, um: get rid of uml unistd.h x86, um: get rid of system.h -> system.h include x86, um: uml atomic.h is not needed anymore x86, um: untangle uml ldt.h x86, um: get rid of more uml asm/arch uses x86, um: remove dead header (uml module-generic.h; never used these days) ...		2008-10-23 10:22:01 -07:00
..
cpufreq	Merge branch 'linus' into test	2008-10-23 00:11:07 -04:00
mcheck	Update email addresses.	2008-10-20 12:50:03 -07:00
mtrr	Merge branches 'x86/alternatives', 'x86/cleanups', 'x86/commandline', 'x86/crashdump', 'x86/debug', 'x86/defconfig', 'x86/doc', 'x86/exports', 'x86/fpu', 'x86/gart', 'x86/idle', 'x86/mm', 'x86/mtrr', 'x86/nmi-watchdog', 'x86/oprofile', 'x86/paravirt', 'x86/reboot', 'x86/sparse-fixes', 'x86/tsc', 'x86/urgent' and 'x86/vmalloc' into x86-v28-for-linus-phase1	2008-10-06 18:17:07 +02:00
.gitignore	Update .gitignore files for generated targets	2008-10-20 11:24:31 -07:00
addon_cpuid_features.c	Merge branch 'linus' into x86/x2apic	2008-09-04 13:02:35 +02:00
amd.c	x86: print out apic id in hex format	2008-10-16 16:53:09 +02:00
bugs.c	x86: fdiv bug detection fix	2008-07-31 23:56:27 +02:00
bugs_64.c	x86: move bugs_64.c to cpu/bugs_64.c	2008-06-03 14:43:00 -07:00
centaur.c	x86: move mtrr cpu cap setting early in early_init_xxxx	2008-09-06 17:50:55 +02:00
centaur_64.c	x86: centaur_64.c remove duplicated setting of CONSTANT_TSC	2008-09-10 08:21:06 +02:00
cmpxchg.c	x86: move cmpxchg fallbacks to a generic place	2008-08-18 16:05:47 +02:00
common.c	x86: do not allow to optimize flag_is_changeable_p() (rev. 2)	2008-10-13 10:33:13 +02:00
cpu.h	x86: remove duplicated get_model_name() calling	2008-09-06 14:09:12 +02:00
cyrix.c	x86: move mtrr cpu cap setting early in early_init_xxxx	2008-09-06 17:50:55 +02:00
intel.c	x86: print out apic id in hex format	2008-10-16 16:53:09 +02:00
intel_cacheinfo.c	Merge branch 'linus' into x86/cpu	2008-08-15 16:16:15 +02:00
Makefile	x86, um: ... and asm-x86 move	2008-10-22 22:55:20 -07:00
mkcapflags.pl	x86: generate names for /proc/cpuinfo from <asm/cpufeature.h>	2008-08-27 19:23:22 -07:00
perfctr-watchdog.c	ftrace: mark lapic_wd_event() notrace	2008-10-14 10:34:36 +02:00
powerflags.c	x86: generate names for /proc/cpuinfo from <asm/cpufeature.h>	2008-08-27 19:23:22 -07:00
proc.c	NR_CPUS: Replace NR_CPUS in arch/x86/kernel/cpu/proc.c	2008-07-20 10:21:09 +02:00
transmeta.c	x86: move transmeta cap read to early_init_transmeta()	2008-09-14 14:09:14 +02:00
umc.c	x86: remove cpu_vendor_dev	2008-09-04 21:09:45 +02:00