linux/arch/i386/kernel
Linus Torvalds 9a9136e270 Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (25 commits)
  sound: convert "sound" subdirectory to UTF-8
  MAINTAINERS: Add cxacru website/mailing list
  include files: convert "include" subdirectory to UTF-8
  general: convert "kernel" subdirectory to UTF-8
  documentation: convert the Documentation directory to UTF-8
  Convert the toplevel files CREDITS and MAINTAINERS to UTF-8.
  remove broken URLs from net drivers' output
  Magic number prefix consistency change to Documentation/magic-number.txt
  trivial: s/i_sem /i_mutex/
  fix file specification in comments
  drivers/base/platform.c: fix small typo in doc
  misc doc and kconfig typos
  Remove obsolete fat_cvf help text
  Fix occurrences of "the the "
  Fix minor typoes in kernel/module.c
  Kconfig: Remove reference to external mqueue library
  Kconfig: A couple of grammatical fixes in arch/i386/Kconfig
  Correct comments in genrtc.c to refer to correct /proc file.
  Fix more "deprecated" spellos.
  Fix "deprecated" typoes.
  ...

Fix trivial comment conflict in kernel/relay.c.
2007-05-09 12:54:17 -07:00
..
acpi
cpu
.gitignore
Makefile
alternative.c
apic.c
apm.c
asm-offsets.c
bootflag.c
cpuid.c
crash.c
crash_dump.c
doublefault.c
e820.c
early_printk.c
efi.c
efi_stub.S
entry.S
head.S
hpet.c
i386_ksyms.c
i387.c
i8237.c
i8253.c
i8259.c
init_task.c
io_apic.c
ioport.c
irq.c
kprobes.c
ldt.c
legacy_serial.c
machine_kexec.c
mca.c
microcode.c
module.c
mpparse.c
msr.c
nmi.c
numaq.c
paravirt.c
pci-dma.c
pcspeaker.c
process.c
ptrace.c
quirks.c
reboot.c
reboot_fixups.c
relocate_kernel.S
scx200.c
setup.c
sigframe.h
signal.c
smp.c
smpboot.c
srat.c
summit.c
sys_i386.c
syscall_table.S
sysenter.c
time.c
topology.c
trampoline.S
traps.c
tsc.c
tsc_sync.c
verify_cpu.S
vm86.c
vmi.c
vmiclock.c
vmlinux.lds.S
vsyscall-int80.S
vsyscall-note.S
vsyscall-sigreturn.S
vsyscall-sysenter.S
vsyscall.S
vsyscall.lds.S