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
..
chan_kern.c	[PATCH] uml: some harmless sparse warning fixes	2006-02-01 08:53:23 -08:00
chan_user.c	[PATCH] uml: close TUN/TAP file descriptors	2006-02-07 16:12:32 -08:00
cow_sys.h	[PATCH] uml: avoid warnings for diffent names for an unsigned quadword	2006-04-11 06:18:37 -07:00
cow_user.c	[PATCH] uml: fix patch mismerge	2006-05-01 18:17:44 -07:00
cow.h	[PATCH] uml: avoid warnings for diffent names for an unsigned quadword	2006-04-11 06:18:37 -07:00
daemon_kern.c	[PATCH] uml: fix initcall return values	2006-03-31 12:18:50 -08:00
daemon_user.c
daemon.h
fd.c
harddog_kern.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00
harddog_user.c
hostaudio_kern.c	[PATCH] uml: sparse cleanups	2006-03-31 12:18:51 -08:00
line.c	[PATCH] devfs: Remove the line_driver devfs_name field as it's no longer needed	2006-06-26 12:25:09 -07:00
Makefile
mcast_kern.c	[PATCH] uml: fix initcall return values	2006-03-31 12:18:50 -08:00
mcast_user.c
mcast.h
mconsole_kern.c	[PATCH] kernel/sys.c: cleanups	2006-06-25 10:01:06 -07:00
mconsole_user.c
mmapper_kern.c
net_kern.c	[PATCH] uml: balance list_add and list_del in the network driver	2006-02-07 16:12:32 -08:00
net_user.c	[PATCH] uml: fix hang on run_helper() failure on uml_net	2006-04-11 06:18:36 -07:00
null.c
pcap_kern.c	[PATCH] uml: fix initcall return values	2006-03-31 12:18:50 -08:00
pcap_user.c
pcap_user.h
port_kern.c
port_user.c
port.h
pty.c
random.c
slip_common.c
slip_common.h	[PATCH] uml: fix hugest stack users	2006-02-01 08:53:22 -08:00
slip_kern.c	[PATCH] uml: fix initcall return values	2006-03-31 12:18:50 -08:00
slip_user.c
slip.h
slirp_kern.c	[PATCH] uml: sparse cleanups	2006-03-31 12:18:51 -08:00
slirp_user.c	[PATCH] uml: fix format errors	2006-04-11 06:18:36 -07:00
slirp.h
ssl.c	[PATCH] devfs: Remove the line_driver devfs_name field as it's no longer needed	2006-06-26 12:25:09 -07:00
ssl.h
stderr_console.c	[PATCH] uml: unregister useless console when it's not needed	2006-06-30 11:25:37 -07:00
stdio_console.c	[PATCH] devfs: Remove the line_driver devfs_name field as it's no longer needed	2006-06-26 12:25:09 -07:00
stdio_console.h
tty.c
ubd_kern.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/devfs-2.6	2006-06-29 14:19:21 -07:00
ubd_user.c
xterm_kern.c
xterm.c
xterm.h