kernel-ark/init
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
..
calibrate.c [PATCH] Platform SMIs and their interferance with tsc based delay calibration 2005-06-23 09:45:08 -07:00
do_mounts_initrd.c [PATCH] devfs: Remove devfs from the init code 2006-06-26 12:25:05 -07:00
do_mounts_md.c [PATCH] devfs: Remove devfs from the init code 2006-06-26 12:25:05 -07:00
do_mounts_rd.c [PATCH] devfs: Remove devfs from the init code 2006-06-26 12:25:05 -07:00
do_mounts.c [PATCH] devfs: Remove devfs from the init code 2006-06-26 12:25:05 -07:00
do_mounts.h [PATCH] devfs: Remove the devfs_fs_kernel.h file from the tree 2006-06-26 12:25:08 -07:00
initramfs.c [PATCH] initramfs overwrite fix 2006-06-26 09:58:40 -07:00
Kconfig [PATCH] UML: fix the INIT_ENV_ARG_LIMIT dependencies 2006-06-30 11:25:37 -07:00
main.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial 2006-06-30 15:39:30 -07:00
Makefile [PATCH] devfs: Remove devfs from the init code 2006-06-26 12:25:05 -07:00
version.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00