Changeset 2b0db98 in mainline for uspace/srv

Timestamp:

2011-01-07T14:02:56Z (15 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

6986418

Parents:

d99120f (diff), 0f191a2 (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:

Merged development into lelian/hidd

Location:

uspace/srv

Files:

• bd/ata_bd/ata_bd.c (modified) (view diffs)
• bd/ata_bd/ata_bd.h (modified) (view diffs)
• bd/ata_bd/ata_hw.h (added)
• devman/devman.c (modified) (view diffs)
• devman/main.c (modified) (view diffs)
• devmap/devmap.c (modified) (view diffs)
• fs/devfs/devfs_ops.c (modified) (view diffs)
• hid/console/console.c (modified) (view diffs)
• 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_drv.h (modified) (view diffs)
• hw/netif/dp8390/dp8390_module.c (modified) (view diffs)
• hw/netif/dp8390/dp8390_port.h (modified) (view diffs)
• hw/netif/dp8390/local.h (deleted)
• hw/netif/dp8390/ne2000.c (modified) (view diffs)
• hw/netif/dp8390/ne2000.h (modified) (view diffs)
• net/cfg/lo (moved) (moved from uspace/srv/net/cfg/lo.netif_standalone ) (view diffs)
• net/cfg/lo.netif_nil_bundle (deleted)
• net/cfg/ne2k (moved) (moved from uspace/srv/net/cfg/ne2k.netif_standalone ) (view diffs)
• net/cfg/ne2k.netif_nil_bundle (deleted)
• net/il/arp/arp.c (modified) (view diffs)
• net/il/arp/arp_module.c (modified) (view diffs)
• net/il/ip/ip.c (modified) (view diffs)
• net/il/ip/ip_module.c (modified) (view diffs)
• net/net/net.c (modified) (view diffs)
• net/netif/lo/Makefile (modified) (view diffs)
• net/netif/lo/lo.c (modified) (view diffs)
• net/nil/eth/Makefile (modified) (view diffs)
• net/nil/eth/eth.c (modified) (view diffs)
• net/nil/eth/eth_module.c (modified) (view diffs)
• net/nil/nildummy/Makefile (modified) (view diffs)
• net/nil/nildummy/nildummy_module.c (modified) (view diffs)
• net/tl/icmp/icmp.c (modified) (view diffs)
• net/tl/icmp/icmp_module.c (modified) (view diffs)
• net/tl/tcp/tcp.c (modified) (view diffs)
• net/tl/tcp/tcp_module.c (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_register.c (modified) (view diffs)