kernel_optimize_test/arch/i386/kernel/cpu
Linus Torvalds ea62ccd00f Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6
* 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6: (231 commits)
  [PATCH] i386: Don't delete cpu_devs data to identify different x86 types in late_initcall
  [PATCH] i386: type may be unused
  [PATCH] i386: Some additional chipset register values validation.
  [PATCH] i386: Add missing !X86_PAE dependincy to the 2G/2G split.
  [PATCH] x86-64: Don't exclude asm-offsets.c in Documentation/dontdiff
  [PATCH] i386: avoid redundant preempt_disable in __unlazy_fpu
  [PATCH] i386: white space fixes in i387.h
  [PATCH] i386: Drop noisy e820 debugging printks
  [PATCH] x86-64: Fix allnoconfig error in genapic_flat.c
  [PATCH] x86-64: Shut up warnings for vfat compat ioctls on other file systems
  [PATCH] x86-64: Share identical video.S between i386 and x86-64
  [PATCH] x86-64: Remove CONFIG_REORDER
  [PATCH] x86-64: Print type and size correctly for unknown compat ioctls
  [PATCH] i386: Remove copy_*_user BUG_ONs for (size < 0)
  [PATCH] i386: Little cleanups in smpboot.c
  [PATCH] x86-64: Don't enable NUMA for a single node in K8 NUMA scanning
  [PATCH] x86: Use RDTSCP for synchronous get_cycles if possible
  [PATCH] i386: Add X86_FEATURE_RDTSCP
  [PATCH] i386: Implement X86_FEATURE_SYNC_RDTSC on i386
  [PATCH] i386: Implement alternative_io for i386
  ...

Fix up trivial conflict in include/linux/highmem.h manually.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-05-05 14:55:20 -07:00
..
cpufreq Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6 2007-05-04 18:04:29 -07:00
mcheck [PATCH] i386: check capability 2007-05-02 19:27:18 +02:00
mtrr [PATCH] i386: fix mtrr sections 2007-05-02 19:27:18 +02:00
amd.c [PATCH] i386: Don't delete cpu_devs data to identify different x86 types in late_initcall 2007-05-02 19:27:22 +02:00
bugs.c [PATCH] i386: Clean up asm-i386/bugs.h 2007-05-02 19:27:12 +02:00
centaur.c [PATCH] i386: Don't delete cpu_devs data to identify different x86 types in late_initcall 2007-05-02 19:27:22 +02:00
common.c [PATCH] i386: Fix UP gdt bugs 2007-05-02 19:27:16 +02:00
cpu.h [PATCH] i386: remove redundant generic_identify() calls when identifying cpus 2006-09-26 10:52:36 +02:00
cyrix.c [PATCH] i386: Don't delete cpu_devs data to identify different x86 types in late_initcall 2007-05-02 19:27:22 +02:00
intel_cacheinfo.c [PATCH] i386: replace kmalloc+memset with kzalloc 2006-12-07 02:14:19 +01:00
intel.c [PATCH] i386: Implement X86_FEATURE_SYNC_RDTSC on i386 2007-05-02 19:27:20 +02:00
Makefile [PATCH] i386: Clean up NMI watchdog code 2007-05-02 19:27:20 +02:00
nexgen.c [PATCH] i386: Don't delete cpu_devs data to identify different x86 types in late_initcall 2007-05-02 19:27:22 +02:00
perfctr-watchdog.c [PATCH] i386: Clean up NMI watchdog code 2007-05-02 19:27:20 +02:00
proc.c [PATCH] x86: remove constant_tsc reporting from /proc/cpuinfo' power flags 2007-05-02 19:27:09 +02:00
rise.c [PATCH] i386: Don't delete cpu_devs data to identify different x86 types in late_initcall 2007-05-02 19:27:22 +02:00
transmeta.c [PATCH] i386: Don't delete cpu_devs data to identify different x86 types in late_initcall 2007-05-02 19:27:22 +02:00
umc.c [PATCH] i386: Don't delete cpu_devs data to identify different x86 types in late_initcall 2007-05-02 19:27:22 +02:00