From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Fri, 30 Jun 2006 22:39:30 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
X-Git-Tag: v2.6.18-rc1~254
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=22a3e233ca08a2ddc949ba1ae8f6e16ec7ef1a13;p=linux-2.6

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
---

22a3e233ca08a2ddc949ba1ae8f6e16ec7ef1a13
diff --cc arch/um/kernel/vmlinux.lds.S
index 0a7d50ff9a,f8aeb448aa..72acdce205
--- a/arch/um/kernel/vmlinux.lds.S
+++ b/arch/um/kernel/vmlinux.lds.S
@@@ -1,6 -1,3 +1,5 @@@
- #include <linux/config.h>
 +/* in case the preprocessor is a 32bit one */
 +#undef i386
  #ifdef CONFIG_LD_SCRIPT_STATIC
  #include "uml.lds.S"
  #else