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
..
ali14xx.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
buddha.c	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
dtc2278.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
falconide.c	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
gayle.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
hd.c	[PATCH] Add block_device_operations.getgeo block device method	2006-01-08 20:13:54 -08:00
ht6560b.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
ide-cs.c	[PATCH] pcmcia: Make ide_cs work with the memory space of CF-Cards if IO space is not available	2006-06-30 22:09:11 +02:00
macide.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
Makefile	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
q40ide.c	[PATCH] m68k: completely initialize hw_regs_t in ide_setup_ports	2006-06-23 07:43:00 -07:00
qd65xx.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
qd65xx.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
umc8672.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00