Changeset 8023571 in mainline

Timestamp:

2010-03-21T09:40:37Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

7c682dd1

Parents:

4e9aaf5 (diff), 19f857a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from dev/misc.

Files:

• kernel/Makefile (modified) (view diffs)
• kernel/arch/arm32/src/arm32.c (modified) (view diffs)
• kernel/arch/ia64/src/drivers/ski.c (modified) (view diffs)
• kernel/arch/ia64/src/ia64.c (modified) (view diffs)
• kernel/arch/mips32/src/mips32.c (modified) (view diffs)
• kernel/arch/ppc32/src/ppc32.c (modified) (view diffs)
• kernel/arch/sparc64/src/console.c (modified) (view diffs)
• kernel/arch/sparc64/src/drivers/kbd.c (modified) (view diffs)
• kernel/arch/sparc64/src/drivers/pci.c (modified) (view diffs)
• kernel/arch/sparc64/src/drivers/scr.c (modified) (view diffs)
• kernel/arch/sparc64/src/drivers/sgcn.c (modified) (view diffs)
• kernel/arch/sparc64/src/smp/sun4v/smp.c (modified) (view diffs)
• kernel/arch/sparc64/src/sun4u/sparc64.c (modified) (view diffs)
• kernel/arch/sparc64/src/sun4v/md.c (modified) (view diffs)
• kernel/arch/sparc64/src/sun4v/sparc64.c (modified) (view diffs)
• kernel/genarch/src/drivers/dsrln/dsrlnout.c (modified) (view diffs)
• kernel/genarch/src/drivers/ega/ega.c (modified) (view diffs)
• kernel/genarch/src/fb/fb.c (modified) (view diffs)
• kernel/genarch/src/kbrd/scanc_mac.c (modified) (view diffs)
• kernel/genarch/src/kbrd/scanc_pc.c (modified) (view diffs)
• kernel/genarch/src/kbrd/scanc_pl050.c (modified) (view diffs)
• kernel/genarch/src/kbrd/scanc_sun.c (modified) (view diffs)
• kernel/genarch/src/multiboot/multiboot.c (modified) (view diffs)
• kernel/genarch/src/ofw/ebus.c (modified) (view diffs)
• kernel/genarch/src/ofw/fhc.c (modified) (view diffs)
• kernel/genarch/src/ofw/ofw_tree.c (modified) (view diffs)
• kernel/genarch/src/ofw/pci.c (modified) (view diffs)
• kernel/genarch/src/srln/srln.c (modified) (view diffs)
• kernel/generic/include/str.h (moved) (moved from kernel/generic/include/string.h ) (view diffs)
• kernel/generic/include/sysinfo/sysinfo.h (modified) (view diffs)
• kernel/generic/src/console/cmd.c (modified) (view diffs)
• kernel/generic/src/console/console.c (modified) (view diffs)
• kernel/generic/src/console/kconsole.c (modified) (view diffs)
• kernel/generic/src/debug/symtab.c (modified) (view diffs)
• kernel/generic/src/lib/str.c (moved) (moved from kernel/generic/src/lib/string.c ) (view diffs)
• kernel/generic/src/main/kinit.c (modified) (view diffs)
• kernel/generic/src/printf/printf_core.c (modified) (view diffs)
• kernel/generic/src/printf/vprintf.c (modified) (view diffs)
• kernel/generic/src/printf/vsnprintf.c (modified) (view diffs)
• kernel/generic/src/proc/task.c (modified) (view diffs)
• kernel/generic/src/udebug/udebug_ops.c (modified) (view diffs)
• uspace/app/bdsh/cmds/builtin_cmds.c (modified) (view diffs)
• uspace/app/bdsh/cmds/builtins/cd/cd.c (modified) (view diffs)
• uspace/app/bdsh/cmds/mod_cmds.c (modified) (view diffs)
• uspace/app/bdsh/cmds/modules/bdd/bdd.c (modified) (view diffs)
• uspace/app/bdsh/cmds/modules/cat/cat.c (modified) (view diffs)
• uspace/app/bdsh/cmds/modules/cp/cp.c (modified) (view diffs)
• uspace/app/bdsh/cmds/modules/help/help.c (modified) (view diffs)
• uspace/app/bdsh/cmds/modules/ls/ls.c (modified) (view diffs)
• uspace/app/bdsh/cmds/modules/mkdir/mkdir.c (modified) (view diffs)
• uspace/app/bdsh/cmds/modules/mkfile/mkfile.c (modified) (view diffs)
• uspace/app/bdsh/cmds/modules/rm/rm.c (modified) (view diffs)
• uspace/app/bdsh/cmds/modules/touch/touch.c (modified) (view diffs)
• uspace/app/bdsh/errors.c (modified) (view diffs)
• uspace/app/bdsh/exec.c (modified) (view diffs)
• uspace/app/bdsh/input.c (modified) (view diffs)
• uspace/app/bdsh/scli.c (modified) (view diffs)
• uspace/app/bdsh/util.c (modified) (view diffs)
• uspace/app/edit/sheet.c (modified) (view diffs)
• uspace/app/init/init.c (modified) (view diffs)
• uspace/app/redir/redir.c (modified) (view diffs)
• uspace/app/tester/tester.c (modified) (view diffs)
• uspace/app/tester/vfs/vfs1.c (modified) (view diffs)
• uspace/app/tetris/input.c (modified) (view diffs)
• uspace/app/tetris/scores.c (modified) (view diffs)
• uspace/app/tetris/scores.h (modified) (view diffs)
• uspace/app/tetris/screen.c (modified) (view diffs)
• uspace/app/tetris/tetris.c (modified) (view diffs)
• uspace/app/trace/trace.c (modified) (view diffs)
• uspace/lib/libc/Makefile (modified) (view diffs)
• uspace/lib/libc/generic/adt/hash_table.c (modified) (view diffs)
• uspace/lib/libc/generic/clipboard.c (modified) (view diffs)
• uspace/lib/libc/generic/devmap.c (modified) (view diffs)
• uspace/lib/libc/generic/getopt.c (modified) (view diffs)
• uspace/lib/libc/generic/io/asprintf.c (modified) (view diffs)
• uspace/lib/libc/generic/io/io.c (modified) (view diffs)
• uspace/lib/libc/generic/io/klog.c (modified) (view diffs)
• uspace/lib/libc/generic/io/printf_core.c (modified) (view diffs)
• uspace/lib/libc/generic/io/vprintf.c (modified) (view diffs)
• uspace/lib/libc/generic/io/vsnprintf.c (modified) (view diffs)
• uspace/lib/libc/generic/loader.c (modified) (view diffs)
• uspace/lib/libc/generic/str.c (moved) (moved from uspace/lib/libc/generic/string.c ) (view diffs)
• uspace/lib/libc/generic/sysinfo.c (modified) (view diffs)
• uspace/lib/libc/generic/task.c (modified) (view diffs)
• uspace/lib/libc/generic/thread.c (modified) (view diffs)
• uspace/lib/libc/generic/tls.c (modified) (view diffs)
• uspace/lib/libc/generic/vfs/vfs.c (modified) (view diffs)
• uspace/lib/libc/include/stdio.h (modified) (view diffs)
• uspace/lib/libc/include/str.h (moved) (moved from uspace/lib/libc/include/string.h ) (view diffs)
• uspace/lib/libc/include/sysinfo.h (modified) (view diffs)
• uspace/lib/libpci/access.c (modified) (view diffs)
• uspace/lib/libpci/generic.c (modified) (view diffs)
• uspace/lib/libpci/names.c (modified) (view diffs)
• uspace/srv/bd/ata_bd/ata_bd.c (modified) (view diffs)
• uspace/srv/bd/ata_bd/ata_bd.h (modified) (view diffs)
• uspace/srv/devmap/devmap.c (modified) (view diffs)
• uspace/srv/fs/devfs/devfs_ops.c (modified) (view diffs)
• uspace/srv/fs/fat/fat_dentry.c (modified) (view diffs)
• uspace/srv/fs/fat/fat_idx.c (modified) (view diffs)
• uspace/srv/fs/fat/fat_ops.c (modified) (view diffs)
• uspace/srv/fs/tmpfs/tmpfs_dump.c (modified) (view diffs)
• uspace/srv/fs/tmpfs/tmpfs_ops.c (modified) (view diffs)
• uspace/srv/hid/console/console.c (modified) (view diffs)
• uspace/srv/hid/console/gcons.c (modified) (view diffs)
• uspace/srv/hid/fb/fb.c (modified) (view diffs)
• uspace/srv/hid/fb/serial_console.c (modified) (view diffs)
• uspace/srv/loader/main.c (modified) (view diffs)
• uspace/srv/net/app/echo/echo.c (modified) (view diffs)
• uspace/srv/net/app/nettest1/nettest1.c (modified) (view diffs)
• uspace/srv/net/app/nettest2/nettest2.c (modified) (view diffs)
• uspace/srv/net/app/parse.c (modified) (view diffs)
• uspace/srv/net/app/ping/ping.c (modified) (view diffs)
• uspace/srv/net/il/arp/arp.c (modified) (view diffs)
• uspace/srv/net/il/ip/ip.c (modified) (view diffs)
• uspace/srv/net/inet.c (modified) (view diffs)
• uspace/srv/net/net/net.c (modified) (view diffs)
• uspace/srv/net/net/net_bundle.c (modified) (view diffs)
• uspace/srv/net/net/net_standalone.c (modified) (view diffs)
• uspace/srv/net/netif/lo/lo.c (modified) (view diffs)
• uspace/srv/net/nil/eth/eth.c (modified) (view diffs)
• uspace/srv/net/nil/nildummy/nildummy.c (modified) (view diffs)
• uspace/srv/net/tl/icmp/icmp.c (modified) (view diffs)
• uspace/srv/vfs/vfs.c (modified) (view diffs)
• uspace/srv/vfs/vfs_file.c (modified) (view diffs)
• uspace/srv/vfs/vfs_lookup.c (modified) (view diffs)
• uspace/srv/vfs/vfs_node.c (modified) (view diffs)
• uspace/srv/vfs/vfs_ops.c (modified) (view diffs)
• uspace/srv/vfs/vfs_register.c (modified) (view diffs)