Changeset 1a23f6e in mainline for uspace

Timestamp:

2012-05-04T10:41:44Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

af42a2b

Parents:

6efb4d2 (diff), d21e935c (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 mainline changes

Location:

uspace

Files:

• Makefile (modified) (view diffs)
• app/inetcfg/inetcfg.c (modified) (view diffs)
• app/init/init.c (modified) (view diffs)
• app/trace/ipc_desc.c (modified) (view diffs)
• drv/bus/usb/vhc/conndev.c (modified) (view diffs)
• lib/c/Makefile (modified) (view diffs)
• lib/c/generic/async.c (modified) (view diffs)
• lib/c/generic/device/nic.c (modified) (view diffs)
• lib/c/generic/devman.c (modified) (view diffs)
• lib/c/generic/inet.c (modified) (view diffs)
• lib/c/generic/inetcfg.c (modified) (view diffs)
• lib/c/generic/inetping.c (modified) (view diffs)
• lib/c/generic/ipc.c (modified) (view diffs)
• lib/c/generic/iplink.c (modified) (view diffs)
• lib/c/generic/iplink_srv.c (modified) (view diffs)
• lib/c/generic/loader.c (modified) (view diffs)
• lib/c/generic/loc.c (modified) (view diffs)
• lib/c/generic/net/modules.c (deleted)
• lib/c/generic/net/socket_client.c (modified) (view diffs)
• lib/c/generic/ns.c (modified) (view diffs)
• lib/c/include/async.h (modified) (view diffs)
• lib/c/include/ipc/ipc.h (modified) (view diffs)
• lib/c/include/net/modules.h (deleted)
• lib/c/include/ns.h (modified) (view diffs)
• lib/drv/generic/remote_usbhc.c (modified) (view diffs)
• lib/fs/libfs.c (modified) (view diffs)
• lib/net/tl/socket_core.c (modified) (view diffs)
• lib/nic/include/nic.h (modified) (view diffs)
• lib/nic/src/nic_driver.c (modified) (view diffs)
• lib/nic/src/nic_ev.c (modified) (view diffs)
• lib/usbhid/src/hidiface.c (modified) (view diffs)
• lib/usbvirt/src/ipc_hc.c (modified) (view diffs)
• srv/clipboard/Makefile (moved) (moved from uspace/srv/clip/Makefile ) (view diffs)
• srv/clipboard/clip.h (moved) (moved from uspace/srv/clip/clip.h ) (view diffs)
• srv/clipboard/clipboard.c (moved) (moved from uspace/srv/clip/clip.c ) (view diffs)
• srv/hid/input/port/chardev.c (modified) (view diffs)
• srv/hid/s3c24xx_ts/Makefile (modified) (view diffs)
• srv/hid/s3c24xx_ts/s3c24xx_ts.c (modified) (view diffs)
• srv/net/inet/inet.c (modified) (view diffs)
• srv/net/inet/inetping.c (modified) (view diffs)
• srv/net/tcp/sock.c (modified) (view diffs)
• srv/net/udp/sock.c (modified) (view diffs)
• srv/vfs/vfs_ops.c (modified) (view diffs)