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
..
fd1772.c	[PATCH] timer initialization cleanup: DEFINE_TIMER	2005-09-09 14:03:48 -07:00
fd1772dma.S	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
Kconfig	[PATCH] show Acorn-specific block devices menu only when required	2006-06-30 11:25:38 -07:00
Makefile	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
mfm.S	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
mfmhd.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00