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
..
drivers	Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial	2006-06-30 15:39:30 -07:00
include	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
kernel	Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial	2006-06-30 15:39:30 -07:00
os-Linux	[PATCH] uml: fix off-by-one bug in VM file creation	2006-06-30 11:25:37 -07:00
scripts	[PATCH] uml: cleanup unprofile expression and build infrastructure	2006-05-01 18:17:45 -07:00
sys-i386	Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial	2006-06-30 15:39:30 -07:00
sys-ia64	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
sys-ppc	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
sys-x86_64	Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial	2006-06-30 15:39:30 -07:00
config.release	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
defconfig	[PATCH] uml: update defconfig	2006-05-01 18:17:44 -07:00
Kconfig	[PATCH] uml: skas0 support for 2G/2G hosts	2006-05-01 18:17:43 -07:00
Kconfig.char	[PATCH] uml: Rename Kconfig files to be like the other arches	2005-09-05 00:06:19 -07:00
Kconfig.debug	[PATCH] clean up default value of SYSCALL_DEBUG	2006-06-23 07:43:03 -07:00
Kconfig.i386	[PATCH] uml: skas0 support for 2G/2G hosts	2006-05-01 18:17:43 -07:00
Kconfig.net	[PATCH] uml: Rename Kconfig files to be like the other arches	2005-09-05 00:06:19 -07:00
Kconfig.scsi	[PATCH] uml: Rename Kconfig files to be like the other arches	2005-09-05 00:06:19 -07:00
Kconfig.x86_64	[PATCH] um: fix undefined reference to hweight32	2006-03-26 08:57:09 -08:00
Makefile	[PATCH] uml: uml-makefile-nicer uses SYMLINK incorrectly	2006-05-01 18:17:45 -07:00
Makefile-i386	[PATCH] uml: add -ffreestanding to CFLAGS	2006-06-05 12:29:17 -07:00
Makefile-ia64	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
Makefile-os-Linux	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
Makefile-ppc	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
Makefile-skas	[PATCH] uml makefiles sanitized	2005-09-29 08:46:26 -07:00
Makefile-tt	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
Makefile-x86_64	[PATCH] uml: fix biarch gcc build on x86_64	2006-06-30 11:25:38 -07:00