Changeset f14291b in mainline for uspace/srv

Timestamp:

2010-10-19T20:55:53Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

a93d79a

Parents:

1882525 (diff), a7a85d16 (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:

• fs/fat/fat_ops.c (modified) (view diffs)
• fs/tmpfs/tmpfs_ops.c (modified) (view diffs)
• hid/console/gcons.c (modified) (view diffs)
• hid/fb/fb.c (modified) (view diffs)
• hid/kbd/Makefile (modified) (view diffs)
• hid/kbd/port/chardev.c (modified) (view diffs)
• hid/s3c24xx_ts/Makefile (added)
• hid/s3c24xx_ts/s3c24xx_ts.c (added)
• hid/s3c24xx_ts/s3c24xx_ts.h (added)
• hw/char/s3c24xx_uart/Makefile (added)
• hw/char/s3c24xx_uart/s3c24xx_uart.c (added)
• hw/char/s3c24xx_uart/s3c24xx_uart.h (added)
• hw/netif/dp8390/Makefile (modified) (view diffs)
• hw/netif/dp8390/dp8390.c (modified) (view diffs)
• hw/netif/dp8390/dp8390.h (modified) (view diffs)
• hw/netif/dp8390/dp8390_module.c (modified) (view diffs)
• net/il/arp/Makefile (modified) (view diffs)
• net/il/arp/arp.c (modified) (view diffs)
• net/il/arp/arp.h (modified) (view diffs)
• net/il/arp/arp_module.c (modified) (view diffs)
• net/il/ip/Makefile (modified) (view diffs)
• net/il/ip/ip.c (modified) (view diffs)
• net/il/ip/ip.h (modified) (view diffs)
• net/il/ip/ip_local.h (moved) (moved from uspace/lib/net/include/ip_local.h ) (view diffs)
• net/il/ip/ip_module.c (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/net_bundle.c (deleted)
• net/net/net_standalone.c (modified) (view diffs)
• net/netif/lo/Makefile (modified) (view diffs)
• net/netif/lo/lo.c (modified) (view diffs)
• net/netstart/Makefile (modified) (view diffs)
• net/netstart/netstart.c (modified) (view diffs)
• net/nil/eth/Makefile (modified) (view diffs)
• net/nil/eth/eth.c (modified) (view diffs)
• net/nil/eth/eth.h (modified) (view diffs)
• net/nil/eth/eth_module.c (modified) (view diffs)
• net/nil/nildummy/Makefile (modified) (view diffs)
• net/nil/nildummy/nildummy.c (modified) (view diffs)
• net/nil/nildummy/nildummy.h (modified) (view diffs)
• net/nil/nildummy/nildummy_module.c (modified) (view diffs)
• net/tl/icmp/Makefile (modified) (view diffs)
• net/tl/icmp/icmp.c (modified) (view diffs)
• net/tl/icmp/icmp.h (modified) (view diffs)
• net/tl/icmp/icmp_module.c (modified) (view diffs)
• net/tl/tcp/Makefile (modified) (view diffs)
• net/tl/tcp/tcp.c (modified) (view diffs)
• net/tl/tcp/tcp.h (modified) (view diffs)
• net/tl/tcp/tcp_module.c (modified) (view diffs)
• net/tl/udp/Makefile (modified) (view diffs)
• net/tl/udp/udp.c (modified) (view diffs)
• net/tl/udp/udp_module.c (modified) (view diffs)
• vfs/vfs.h (modified) (view diffs)
• vfs/vfs_lookup.c (modified) (view diffs)
• vfs/vfs_node.c (modified) (view diffs)
• vfs/vfs_ops.c (modified) (view diffs)
• vfs/vfs_register.c (modified) (view diffs)