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
..
keys	[PATCH] Keys: Allow in-kernel key requestor to pass auxiliary data to upcaller	2006-06-29 10:26:20 -07:00
selinux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial	2006-06-30 15:39:30 -07:00
capability.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
commoncap.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
dummy.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial	2006-06-30 15:39:30 -07:00
inode.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
Kconfig	[PATCH] keys: restrict contents of /proc/keys to Viewable keys	2006-06-26 09:58:18 -07:00
Makefile	[PATCH] add securityfs for all LSMs to use	2005-07-08 18:48:41 -07:00
root_plug.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
seclvl.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
security.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00