Changeset e6edc8d1 in mainline

Timestamp:

2013-07-11T19:13:37Z (11 years ago)

Author:

Manuele Conti <conti.ma@…>

Branches:

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

Children:

67632f7

Parents:

52ff62d3 (diff), 2b3e8840 (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 with mainline changes.

Location:

uspace

Files:

• Makefile.common (modified) (view diffs)
• app/bdsh/cmds/builtins/batch/batch.c (modified) (view diffs)
• app/binutils/intrusive.sh (modified) (view diffs)
• app/binutils/toolchain.sh (modified) (view diffs)
• app/pcc/config.h (modified) (view diffs)
• drv/block/ata_bd/ata_bd.c (modified) (view diffs)
• drv/bus/usb/ehci/main.c (modified) (view diffs)
• drv/bus/usb/ehci/res.c (modified) (view diffs)
• drv/bus/usb/ohci/hc.c (modified) (view diffs)
• drv/bus/usb/ohci/hc.h (modified) (view diffs)
• drv/bus/usb/ohci/ohci.c (modified) (view diffs)
• drv/bus/usb/uhci/hc.c (modified) (view diffs)
• drv/bus/usb/uhci/hc.h (modified) (view diffs)
• drv/bus/usb/uhci/uhci.c (modified) (view diffs)
• drv/bus/usb/uhcirh/main.c (modified) (view diffs)
• drv/bus/usb/uhcirh/port.c (modified) (view diffs)
• drv/char/i8042/i8042.c (modified) (view diffs)
• drv/char/i8042/main.c (modified) (view diffs)
• drv/char/ns8250/ns8250.c (modified) (view diffs)
• drv/char/ps2mouse/main.c (modified) (view diffs)
• drv/char/xtkbd/main.c (modified) (view diffs)
• lib/c/Makefile (modified) (view diffs)
• lib/c/generic/bitops.c (added)
• lib/c/generic/io/io.c (modified) (view diffs)
• lib/c/include/bitops.h (modified) (view diffs)
• lib/c/include/stdio.h (modified) (view diffs)
• lib/posix/Makefile (modified) (view diffs)
• lib/posix/include/posix/ctype.h (modified) (view diffs)
• lib/posix/include/posix/dirent.h (added)
• lib/posix/include/posix/fcntl.h (modified) (view diffs)
• lib/posix/include/posix/fenv.h (added)
• lib/posix/include/posix/float.h (modified) (view diffs)
• lib/posix/include/posix/fnmatch.h (modified) (view diffs)
• lib/posix/include/posix/getopt.h (modified) (view diffs)
• lib/posix/include/posix/inttypes.h (modified) (view diffs)
• lib/posix/include/posix/locale.h (modified) (view diffs)
• lib/posix/include/posix/math.h (modified) (view diffs)
• lib/posix/include/posix/pwd.h (modified) (view diffs)
• lib/posix/include/posix/signal.h (modified) (view diffs)
• lib/posix/include/posix/stddef.h (modified) (view diffs)
• lib/posix/include/posix/stdint.h (modified) (view diffs)
• lib/posix/include/posix/stdio.h (modified) (view diffs)
• lib/posix/include/posix/stdlib.h (modified) (view diffs)
• lib/posix/include/posix/string.h (modified) (view diffs)
• lib/posix/include/posix/strings.h (modified) (view diffs)
• lib/posix/include/posix/sys/mman.h (modified) (view diffs)
• lib/posix/include/posix/sys/stat.h (modified) (view diffs)
• lib/posix/include/posix/sys/types.h (modified) (view diffs)
• lib/posix/include/posix/sys/wait.h (modified) (view diffs)
• lib/posix/include/posix/time.h (modified) (view diffs)
• lib/posix/include/posix/ucontext.h (added)
• lib/posix/include/posix/unistd.h (modified) (view diffs)
• lib/posix/source/ctype.c (modified) (view diffs)
• lib/posix/source/errno.c (modified) (view diffs)
• lib/posix/source/fcntl.c (modified) (view diffs)
• lib/posix/source/fnmatch.c (modified) (view diffs)
• lib/posix/source/getopt.c (modified) (view diffs)
• lib/posix/source/locale.c (modified) (view diffs)
• lib/posix/source/math.c (modified) (view diffs)
• lib/posix/source/pwd.c (modified) (view diffs)
• lib/posix/source/signal.c (modified) (view diffs)
• lib/posix/source/stdio.c (modified) (view diffs)
• lib/posix/source/stdio/scanf.c (modified) (view diffs)
• lib/posix/source/stdlib.c (modified) (view diffs)
• lib/posix/source/stdlib/strtol.c (modified) (view diffs)
• lib/posix/source/stdlib/strtold.c (modified) (view diffs)
• lib/posix/source/string.c (modified) (view diffs)
• lib/posix/source/strings.c (modified) (view diffs)
• lib/posix/source/sys/stat.c (modified) (view diffs)
• lib/posix/source/sys/wait.c (modified) (view diffs)
• lib/posix/source/time.c (modified) (view diffs)
• lib/posix/source/unistd.c (modified) (view diffs)
• lib/posix/tools/create-redefines.sh (added)
• lib/posix/tools/get-collision-list.sh (added)
• lib/posix/tools/transform-symbols.sh (added)
• srv/fs/mfs/mfs.h (modified) (view diffs)
• srv/fs/mfs/mfs_balloc.c (modified) (view diffs)
• srv/fs/mfs/mfs_dentry.c (modified) (view diffs)
• srv/fs/mfs/mfs_ops.c (modified) (view diffs)