Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
Linus Torvalds [Fri, 30 Jun 2006 22:39:30 +0000 (15:39 -0700)]
* 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

43 files changed:
1  2 
MAINTAINERS
arch/arm/mm/mm-armv.c
arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c
arch/i386/kernel/msr.c
arch/i386/mach-voyager/voyager_smp.c
arch/i386/mm/pgtable.c
arch/s390/appldata/appldata_base.c
arch/s390/appldata/appldata_mem.c
arch/um/kernel/vmlinux.lds.S
arch/um/sys-x86_64/syscall_table.c
block/ll_rw_blk.c
drivers/acpi/osl.c
drivers/acpi/pci_irq.c
drivers/char/istallion.c
drivers/edac/amd76x_edac.c
drivers/edac/e752x_edac.c
drivers/edac/e7xxx_edac.c
drivers/edac/edac_mc.c
drivers/edac/edac_mc.h
drivers/edac/i82860_edac.c
drivers/edac/i82875p_edac.c
drivers/edac/r82600_edac.c
drivers/media/video/bt8xx/bttv-cards.c
drivers/media/video/saa7134/saa7134-core.c
drivers/net/wireless/hostap/hostap_cs.c
drivers/parisc/led.c
drivers/pcmcia/au1000_db1x00.c
drivers/usb/core/inode.c
fs/buffer.c
fs/inode.c
fs/nfs/pagelist.c
fs/nfs/write.c
fs/nfsd/vfs.c
fs/proc/proc_misc.c
init/main.c
kernel/signal.c
kernel/sysctl.c
mm/filemap.c
mm/page_alloc.c
mm/shmem.c
security/dummy.c
security/selinux/hooks.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -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
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc fs/buffer.c
Simple merge
diff --cc fs/inode.c
Simple merge
Simple merge
diff --cc fs/nfs/write.c
Simple merge
diff --cc fs/nfsd/vfs.c
Simple merge
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
Simple merge
Simple merge