original_kernel/arch/um/drivers
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
..
Makefile
chan_kern.c
chan_user.c
cow.h
cow_sys.h
cow_user.c
daemon.h
daemon_kern.c
daemon_user.c
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
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
mcast.h
mcast_kern.c
mcast_user.c
mconsole_kern.c
mconsole_user.c
mmapper_kern.c
net_kern.c
net_user.c
null.c
pcap_kern.c
pcap_user.c
pcap_user.h
port.h
port_kern.c
port_user.c
pty.c
random.c
slip.h
slip_common.c
slip_common.h
slip_kern.c
slip_user.c
slirp.h
slirp_kern.c
slirp_user.c
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.c
xterm.h
xterm_kern.c