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

..

skas

[PATCH] zoned vm counters: conversion of nr_pagetables to per zone counter

2006-06-30 11:25:35 -07:00

tt

[PATCH] uml: clean arch_switch usage

2006-03-31 12:18:52 -08:00

asm-offsets.c

[PATCH] uml: fix missing KBUILD_BASENAME

2006-01-11 18:42:09 -08:00

config.c.in

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

dyn.lds.S

[PATCH] i386 / uml: add dwarf sections to static link script

2005-09-10 12:00:17 -07:00

exec_kern.c

[PATCH] uml: implement {get,set}_thread_area for i386

2006-03-31 12:18:52 -08:00

exitcode.c

[PATCH] uml: Clean up prink calls

2005-07-28 21:46:05 -07:00

gmon_syms.c

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

gprof_syms.c

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

init_task.c

[PATCH] uml: move libc code out of mem_user.c and tempfile.c

2005-09-17 11:50:00 -07:00

initrd.c

[PATCH] uml: initrd cleanup

2005-05-20 15:48:18 -07:00

irq.c

[PATCH] genirq: rename desc->handler to desc->chip

2006-06-29 10:26:21 -07:00

ksyms.c

[PATCH] uml: fix some double export warnings

2006-04-11 06:18:36 -07:00

Makefile

[PATCH] uml: move tty logging to os-Linux

2006-03-27 08:44:38 -08:00

mem.c

[PATCH] uml: redeclare highmem

2006-03-31 12:18:50 -08:00

physmem.c

Merge git://git.infradead.org/~dwmw2/rbtree-2.6

2006-06-20 14:51:22 -07:00

process_kern.c

[PATCH] uml: implement {get,set}_thread_area for i386

2006-03-31 12:18:52 -08:00

ptrace.c

[PATCH] drop task argument of audit_syscall_{entry,exit}

2006-05-01 06:06:18 -04:00

reboot.c

[PATCH] uml: avoid "CONFIG_NR_CPUS undeclared" bogus error messages

2006-02-01 08:53:23 -08:00

resource.c

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

sigio_kern.c

[PATCH] uml: move SIGIO startup code to os-Linux/start_up.c

2006-03-27 08:44:38 -08:00

signal_kern.c

[PATCH] uml: use generic sys_rt_sigsuspend

2006-01-18 19:20:30 -08:00

smp.c

[PATCH] pidhash: don't count idle threads

2006-03-28 18:36:41 -08:00

syscall_kern.c

[PATCH] uml: sparse cleanups

2006-03-31 12:18:51 -08:00

syscall.c

[PATCH] uml: move libc-dependent time code

2006-01-18 19:20:19 -08:00

sysrq.c

[PATCH] uml: Fix sysrq-r support for skas mode

2005-10-04 13:22:01 -07:00

time_kern.c

[PATCH] uml: remove unneeded time definitions

2006-06-30 11:25:38 -07:00

tlb.c

[PATCH] uml: fix condition in tlb flush

2005-09-22 22:17:36 -07:00

trap_kern.c

[PATCH] uml: sparse cleanups

2006-03-31 12:18:51 -08:00

uaccess.c

[PATCH] uml: separate libc-dependent uaccess code

2005-11-07 07:53:31 -08:00

um_arch.c

[PATCH] Notifier chain update: API changes

2006-03-27 08:44:50 -08:00

umid.c

[PATCH] uml: umid cleanup

2006-01-06 08:33:47 -08:00

uml.lds.S

[PATCH] i386 / uml: add dwarf sections to static link script

2005-09-10 12:00:17 -07:00

vmlinux.lds.S

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial

2006-06-30 15:39:30 -07:00