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
..
arm	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
h8300	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
legacy	Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial	2006-06-30 15:39:30 -07:00
mips
pci	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
ide-cd.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
ide-cd.h
ide-disk.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
ide-dma.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
ide-floppy.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
ide-generic.c
ide-io.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
ide-iops.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
ide-lib.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
ide-pnp.c
ide-probe.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
ide-proc.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
ide-tape.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
ide-taskfile.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
ide-timing.h	[PATCH] ide: actually honor drive's minimum PIO/DMA cycle times	2006-06-26 09:58:27 -07:00
ide.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
Kconfig	[POWERPC] Convert powermac ide blink to new led infrastructure	2006-06-28 11:51:12 +10:00
Makefile
setup-pci.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00