Changeset 1440eae in mainline for uspace

Timestamp:

2011-12-22T12:04:54Z (14 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

3819ce5

Parents:

65d7b0a (diff), a438de48 (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

Location:

uspace

Files:

• app/klog/klog.c (modified) (view diffs)
• app/tester/mm/common.c (modified) (view diffs)
• app/tester/mm/mapping1.c (modified) (view diffs)
• app/trace/syscalls.c (modified) (view diffs)
• app/websrv/websrv.c (modified) (view diffs)
• drv/bus/usb/uhci/utils/malloc32.h (modified) (view diffs)
• drv/bus/usb/usbmast/main.c (modified) (view diffs)
• lib/c/generic/as.c (modified) (view diffs)
• lib/c/generic/async.c (modified) (view diffs)
• lib/c/generic/ddi.c (modified) (view diffs)
• lib/c/generic/elf/elf_load.c (modified) (view diffs)
• lib/c/generic/ipc.c (modified) (view diffs)
• lib/c/generic/malloc.c (modified) (view diffs)
• lib/c/generic/mman.c (modified) (view diffs)
• lib/c/generic/time.c (modified) (view diffs)
• lib/c/include/as.h (modified) (view diffs)
• lib/c/include/async.h (modified) (view diffs)
• lib/c/include/ddi.h (modified) (view diffs)
• lib/c/include/ipc/ipc.h (modified) (view diffs)
• lib/drv/generic/driver.c (modified) (view diffs)
• lib/fb/imgmap.c (modified) (view diffs)
• lib/fb/screenbuffer.c (modified) (view diffs)
• lib/fs/libfs.c (modified) (view diffs)
• lib/net/generic/packet_remote.c (modified) (view diffs)
• lib/nic/src/nic_driver.c (modified) (view diffs)
• srv/bd/ata_bd/ata_bd.c (modified) (view diffs)
• srv/bd/file_bd/file_bd.c (modified) (view diffs)
• srv/bd/gxe_bd/gxe_bd.c (modified) (view diffs)
• srv/bd/part/guid_part/guid_part.c (modified) (view diffs)
• srv/bd/part/mbr_part/mbr_part.c (modified) (view diffs)
• srv/bd/rd/rd.c (modified) (view diffs)
• srv/hid/fb/fb.c (modified) (view diffs)
• srv/hid/fb/port/ega.c (modified) (view diffs)
• srv/hid/fb/port/kchar.c (modified) (view diffs)
• srv/hid/fb/port/kfb.c (modified) (view diffs)
• srv/hid/fb/port/niagara.c (modified) (view diffs)
• srv/hid/input/port/gxemul.c (modified) (view diffs)
• srv/hid/input/port/msim.c (modified) (view diffs)
• srv/hid/input/port/niagara.c (modified) (view diffs)
• srv/hid/input/port/ns16550.c (modified) (view diffs)
• srv/hid/input/port/pl050.c (modified) (view diffs)
• srv/hid/s3c24xx_ts/s3c24xx_ts.c (modified) (view diffs)
• srv/hw/bus/cuda_adb/cuda_adb.c (modified) (view diffs)
• srv/hw/char/i8042/i8042.c (modified) (view diffs)
• srv/hw/char/s3c24xx_uart/s3c24xx_uart.c (modified) (view diffs)
• srv/hw/irc/obio/obio.c (modified) (view diffs)
• srv/net/tl/tcp/conn.c (modified) (view diffs)
• srv/net/tl/tcp/conn.h (modified) (view diffs)
• srv/net/tl/tcp/sock.c (modified) (view diffs)
• srv/net/tl/tcp/tcp_type.h (modified) (view diffs)
• srv/net/tl/tcp/tqueue.c (modified) (view diffs)
• srv/net/tl/tcp/ucall.c (modified) (view diffs)
• srv/net/tl/tcp/ucall.h (modified) (view diffs)
• srv/vfs/vfs.c (modified) (view diffs)