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

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/mm/mm-armv.c
Simple merge

diff --cc arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
Simple merge

diff --cc arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c
Simple merge

diff --cc arch/i386/kernel/msr.c
Simple merge

diff --cc arch/i386/mach-voyager/voyager_smp.c
Simple merge

diff --cc arch/i386/mm/pgtable.c
Simple merge

diff --cc arch/s390/appldata/appldata_base.c
Simple merge

diff --cc arch/s390/appldata/appldata_mem.c
Simple merge

diff --cc arch/um/kernel/vmlinux.lds.S
index 0a7d50f,f8aeb44..72acdce
--- 1/arch/um/kernel/vmlinux.lds.S
--- 2/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

diff --cc arch/um/sys-x86_64/syscall_table.c
Simple merge

diff --cc block/ll_rw_blk.c
Simple merge

diff --cc drivers/acpi/osl.c
Simple merge

diff --cc drivers/acpi/pci_irq.c
Simple merge

diff --cc drivers/char/istallion.c
Simple merge

diff --cc drivers/edac/amd76x_edac.c
Simple merge

diff --cc drivers/edac/e752x_edac.c
Simple merge

diff --cc drivers/edac/e7xxx_edac.c
Simple merge

diff --cc drivers/edac/edac_mc.c
Simple merge

diff --cc drivers/edac/edac_mc.h
Simple merge

diff --cc drivers/edac/i82860_edac.c
Simple merge

diff --cc drivers/edac/i82875p_edac.c
Simple merge

diff --cc drivers/edac/r82600_edac.c
Simple merge

diff --cc drivers/media/video/bt8xx/bttv-cards.c
Simple merge

diff --cc drivers/media/video/saa7134/saa7134-core.c
Simple merge

diff --cc drivers/net/wireless/hostap/hostap_cs.c
Simple merge

diff --cc drivers/parisc/led.c
Simple merge

diff --cc drivers/pcmcia/au1000_db1x00.c
Simple merge

diff --cc drivers/usb/core/inode.c
Simple merge

diff --cc fs/buffer.c
Simple merge

diff --cc fs/inode.c
Simple merge

diff --cc fs/nfs/pagelist.c
Simple merge

diff --cc fs/nfs/write.c
Simple merge

diff --cc fs/nfsd/vfs.c
Simple merge

diff --cc fs/proc/proc_misc.c
Simple merge

diff --cc init/main.c
Simple merge

diff --cc kernel/signal.c
Simple merge

diff --cc kernel/sysctl.c
Simple merge

diff --cc mm/filemap.c
Simple merge

diff --cc mm/page_alloc.c
Simple merge

diff --cc mm/shmem.c
Simple merge

diff --cc security/dummy.c
Simple merge

diff --cc security/selinux/hooks.c
Simple merge