kernel-ark/arch/sparc
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
..
boot Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
kernel Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial 2006-06-30 15:39:30 -07:00
lib Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
math-emu kbuild: use relative path to -I 2006-04-04 16:56:10 +02:00
mm Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
prom Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
defconfig [SPARC32]: Revert IOMAP change eb98129eec 2005-10-10 21:02:26 -07:00
Kconfig [PATCH] bitops: sparc: use generic bitops 2006-03-26 08:57:14 -08:00
Kconfig.debug Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
Makefile [SPARC]: block/ needed in final image link 2005-12-12 14:42:44 -08:00