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
..
as-iosched.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
blktrace.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
cfq-iosched.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
deadline-iosched.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
elevator.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
genhd.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
ioctl.c	[PATCH] Block queue IO tracing support (blktrace) as of 2006-03-23	2006-03-23 20:00:26 +01:00
Kconfig	[PATCH] config: fix CONFIG_LFS option	2006-03-31 12:18:55 -08:00
Kconfig.iosched	[PATCH] Make CFQ the default IO scheduler	2006-06-23 17:10:39 +02:00
ll_rw_blk.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial	2006-06-30 15:39:30 -07:00
Makefile	[PATCH] Block queue IO tracing support (blktrace) as of 2006-03-23	2006-03-23 20:00:26 +01:00
noop-iosched.c	[PATCH] elevator switching race	2006-06-08 15:14:23 -07:00
scsi_ioctl.c	[SCSI] unify SCSI_IOCTL_SEND_COMMAND implementations	2006-04-13 10:13:15 -05:00