Changeset b7068da in mainline for uspace/srv

Timestamp:

2012-02-09T20:35:12Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

591762c6

Parents:

7cede12c (diff), 3d4750f (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/srv

Files:

• bd/ata_bd/ata_bd.c (modified) (view diffs)
• bd/file_bd/file_bd.c (modified) (view diffs)
• bd/gxe_bd/gxe_bd.c (modified) (view diffs)
• bd/part/guid_part/guid_part.c (modified) (view diffs)
• bd/part/mbr_part/mbr_part.c (modified) (view diffs)
• bd/rd/rd.c (modified) (view diffs)
• devman/devman.c (modified) (view diffs)
• devman/main.c (modified) (view diffs)
• fs/mfs/mfs.h (modified) (view diffs)
• fs/mfs/mfs_balloc.c (modified) (view diffs)
• fs/mfs/mfs_dentry.c (modified) (view diffs)
• fs/mfs/mfs_inode.c (modified) (view diffs)
• fs/mfs/mfs_ops.c (modified) (view diffs)
• fs/mfs/mfs_rw.c (modified) (view diffs)
• hid/console/console.c (modified) (view diffs)
• hid/fb/fb.c (modified) (view diffs)
• hid/fb/port/ega.c (modified) (view diffs)
• hid/fb/port/kchar.c (modified) (view diffs)
• hid/fb/port/kfb.c (modified) (view diffs)
• hid/fb/port/niagara.c (modified) (view diffs)
• hid/input/Makefile (modified) (view diffs)
• hid/input/generic/input.c (modified) (view diffs)
• hid/input/include/mouse.h (modified) (view diffs)
• hid/input/include/mouse_proto.h (modified) (view diffs)
• hid/input/port/chardev.c (modified) (view diffs)
• hid/input/port/chardev_mouse.c (deleted)
• hid/input/port/gxemul.c (modified) (view diffs)
• hid/input/port/msim.c (modified) (view diffs)
• hid/input/port/niagara.c (modified) (view diffs)
• hid/input/port/ns16550.c (modified) (view diffs)
• hid/input/port/pl050.c (modified) (view diffs)
• hid/input/proto/adb.c (modified) (view diffs)
• hid/input/proto/mousedev.c (modified) (view diffs)
• hid/input/proto/ps2.c (deleted)
• hid/remcons/Makefile (added)
• hid/remcons/remcons.c (added)
• hid/remcons/remcons.h (added)
• hid/remcons/telnet.h (added)
• hid/remcons/user.c (added)
• hid/remcons/user.h (added)
• hid/s3c24xx_ts/s3c24xx_ts.c (modified) (view diffs)
• hw/bus/cuda_adb/cuda_adb.c (modified) (view diffs)
• hw/char/i8042/i8042.c (deleted)
• hw/char/s3c24xx_uart/s3c24xx_uart.c (modified) (view diffs)
• hw/irc/obio/obio.c (modified) (view diffs)
• loc/loc.c (modified) (view diffs)
• net/cfg/e1k.nic (added)
• net/cfg/lo.nic (modified) (view diffs)
• net/cfg/ne2k.nic (modified) (view diffs)
• net/net/Makefile (modified) (view diffs)
• net/net/net.c (modified) (view diffs)
• net/net/net.h (modified) (view diffs)
• net/net/packet_server.c (modified) (view diffs)
• net/nil/eth/eth.c (modified) (view diffs)
• net/nil/eth/eth.h (modified) (view diffs)
• net/nil/nildummy/nildummy.c (modified) (view diffs)
• net/nil/nildummy/nildummy.h (modified) (view diffs)
• net/tl/tcp/Makefile (modified) (view diffs)
• net/tl/tcp/conn.c (added)
• net/tl/tcp/conn.h (added)
• net/tl/tcp/iqueue.c (added)
• net/tl/tcp/iqueue.h (added)
• net/tl/tcp/ncsim.c (added)
• net/tl/tcp/ncsim.h (added)
• net/tl/tcp/pdu.c (added)
• net/tl/tcp/pdu.h (added)
• net/tl/tcp/rqueue.c (added)
• net/tl/tcp/rqueue.h (added)
• net/tl/tcp/segment.c (added)
• net/tl/tcp/segment.h (added)
• net/tl/tcp/seq_no.c (added)
• net/tl/tcp/seq_no.h (added)
• net/tl/tcp/sock.c (added)
• net/tl/tcp/sock.h (added)
• net/tl/tcp/std.h (added)
• net/tl/tcp/tcp.c (modified) (view diffs)
• net/tl/tcp/tcp.h (modified) (view diffs)
• net/tl/tcp/tcp_header.h (deleted)
• net/tl/tcp/tcp_type.h (added)
• net/tl/tcp/test.c (added)
• net/tl/tcp/test.h (added)
• net/tl/tcp/tqueue.c (added)
• net/tl/tcp/tqueue.h (added)
• net/tl/tcp/ucall.c (added)
• net/tl/tcp/ucall.h (added)
• vfs/vfs.c (modified) (view diffs)