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
..
802	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
8021q	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
appletalk	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
atm	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
ax25	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
bluetooth	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
bridge	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
core	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
dccp	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
decnet	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
econet	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
ethernet	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
ieee80211	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
ipv4	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
ipv6	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
ipx	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
irda	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
key	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
lapb	[NET]: Kill skb->list	2005-08-29 15:31:14 -07:00
llc	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
netfilter	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
netlink	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
netrom	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
packet	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
rose	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
rxrpc	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
sched	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
sctp	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
sunrpc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial	2006-06-30 15:39:30 -07:00
tipc	[TIPC]: Initial activation message now includes TIPC version number	2006-06-29 17:08:20 -07:00
unix	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
wanrouter	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
x25	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
xfrm	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
compat.c	[NETFILTER]: iptables 32bit compat layer	2006-04-01 02:25:19 -08:00
Kconfig	[SECMARK]: Add secmark support to core networking.	2006-06-17 21:29:57 -07:00
Makefile	[TIPC] Initial merge	2006-01-12 14:06:31 -08:00
nonet.c	[PATCH] Make most file operations structs in fs/ const	2006-03-28 09:16:06 -08:00
socket.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
sysctl_net.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
TUNABLE	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00