1
linux/arch/i386/kernel/cpu
Linus Torvalds 22a3e233ca Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial:
  Remove obsolete #include <linux/config.h>
  remove obsolete swsusp_encrypt
  arch/arm26/Kconfig typos
  Documentation/IPMI typos
  Kconfig: Typos in net/sched/Kconfig
  v9fs: do not include linux/version.h
  Documentation/DocBook/mtdnand.tmpl: typo fixes
  typo fixes: specfic -> specific
  typo fixes in Documentation/networking/pktgen.txt
  typo fixes: occuring -> occurring
  typo fixes: infomation -> information
  typo fixes: disadvantadge -> disadvantage
  typo fixes: aquire -> acquire
  typo fixes: mecanism -> mechanism
  typo fixes: bandwith -> bandwidth
  fix a typo in the RTC_CLASS help text
  smb is no longer maintained

Manually merged trivial conflict in arch/um/kernel/vmlinux.lds.S
2006-06-30 15:39:30 -07:00
..
cpufreq Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial 2006-06-30 15:39:30 -07:00
mcheck Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
mtrr [PATCH] sem2mutex: misc static one-file mutexes 2006-03-26 08:56:55 -08:00
amd.c [PATCH] i386: move phys_proc_id and cpu_core_id to cpuinfo_x86 2006-06-27 17:32:37 -07:00
centaur.c [PATCH] Fix the imlicit declaration of mtrr_centaur_report_mcr in arch/i386/kernel/cpu/centaur.c 2006-03-23 07:38:06 -08:00
common.c [PATCH] fix subarchitecture breakage with CONFIG_SCHED_SMT 2006-06-27 17:32:38 -07:00
cpu.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
cyrix.c spelling fixes 2006-06-26 18:35:02 +02:00
intel_cacheinfo.c [PATCH] cpu hotplug: make cpu_notifier related notifier blocks __cpuinit only 2006-06-27 17:32:41 -07:00
intel.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
Makefile Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
nexgen.c [PATCH] i386 cpu hotplug: don't access freed memory 2006-02-05 11:06:53 -08:00
proc.c [PATCH] i386: move phys_proc_id and cpu_core_id to cpuinfo_x86 2006-06-27 17:32:37 -07:00
rise.c [PATCH] i386 cpu hotplug: don't access freed memory 2006-02-05 11:06:53 -08:00
transmeta.c [PATCH] x86_64: Add boot option to disable randomized mappings and cleanup 2006-02-17 08:00:40 -08:00
umc.c [PATCH] i386 cpu hotplug: don't access freed memory 2006-02-05 11:06:53 -08:00