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
..
alpha	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
arm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial	2006-06-30 15:39:30 -07:00
arm26	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
cris	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
frv	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
h8300	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
i386	Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial	2006-06-30 15:39:30 -07:00
ia64	Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial	2006-06-30 15:39:30 -07:00
m32r	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
m68k	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
m68knommu	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
mips	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
parisc	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
powerpc	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
ppc	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
s390	Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial	2006-06-30 15:39:30 -07:00
sh	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
sh64	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
sparc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial	2006-06-30 15:39:30 -07:00
sparc64	Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial	2006-06-30 15:39:30 -07:00
um	Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial	2006-06-30 15:39:30 -07:00
v850	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
x86_64	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
xtensa	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00