Changeset 8426912a in mainline

Timestamp:

2011-01-14T12:35:19Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

d450964

Parents:

6610565b (diff), 08abd81 (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

Files:

• boot/Makefile.common (modified) (view diffs)
• kernel/arch/amd64/include/interrupt.h (modified) (view diffs)
• kernel/arch/amd64/src/amd64.c (modified) (view diffs)
• kernel/arch/ia32/include/interrupt.h (modified) (view diffs)
• kernel/arch/ia32/src/ia32.c (modified) (view diffs)
• kernel/arch/ia64/include/interrupt.h (modified) (view diffs)
• kernel/arch/ia64/src/ia64.c (modified) (view diffs)
• kernel/generic/include/ddi/ddi.h (modified) (view diffs)
• kernel/generic/include/syscall/syscall.h (modified) (view diffs)
• kernel/generic/src/ddi/ddi.c (modified) (view diffs)
• kernel/generic/src/mm/slab.c (modified) (view diffs)
• kernel/generic/src/syscall/syscall.c (modified) (view diffs)
• uspace/Makefile (modified) (view diffs)
• uspace/app/trace/syscalls.c (modified) (view diffs)
• uspace/doc/doxygroups.h (modified) (view diffs)
• uspace/drv/ns8250/ns8250.c (modified) (view diffs)
• uspace/lib/c/generic/ddi.c (modified) (view diffs)
• uspace/lib/c/generic/devman.c (modified) (view diffs)
• uspace/lib/c/include/ddi.h (modified) (view diffs)
• uspace/lib/c/include/ipc/il.h (modified) (view diffs)
• uspace/lib/c/include/ipc/ip.h (modified) (view diffs)
• uspace/lib/c/include/ipc/services.h (modified) (view diffs)
• uspace/lib/net/Makefile (modified) (view diffs)
• uspace/lib/net/generic/protocol_map.c (modified) (view diffs)
• uspace/lib/net/il/il_remote.c (moved) (moved from uspace/lib/net/il/il_interface.c ) (view diffs)
• uspace/lib/net/il/il_skel.c (added)
• uspace/lib/net/il/ip_remote.c (modified) (view diffs)
• uspace/lib/net/include/il_local.h (deleted)
• uspace/lib/net/include/il_remote.h (moved) (moved from uspace/lib/net/include/il_interface.h ) (view diffs)
• uspace/lib/net/include/il_skel.h (moved) (moved from uspace/srv/net/tl/tcp/tcp_module.c ) (view diffs)
• uspace/lib/net/include/nil_interface.h (deleted)
• uspace/lib/net/include/nil_local.h (deleted)
• uspace/lib/net/include/nil_remote.h (modified) (view diffs)
• uspace/lib/net/include/nil_skel.h (added)
• uspace/lib/net/include/tl_local.h (deleted)
• uspace/lib/net/include/tl_remote.h (moved) (moved from uspace/lib/net/include/tl_interface.h ) (view diffs)
• uspace/lib/net/include/tl_skel.h (moved) (moved from uspace/srv/net/nil/eth/eth_module.c ) (view diffs)
• uspace/lib/net/netif/netif_skel.c (modified) (view diffs)
• uspace/lib/net/nil/nil_remote.c (modified) (view diffs)
• uspace/lib/net/nil/nil_skel.c (added)
• uspace/lib/net/tl/tl_common.c (modified) (view diffs)
• uspace/lib/net/tl/tl_remote.c (moved) (moved from uspace/lib/net/tl/tl_interface.c ) (view diffs)
• uspace/lib/net/tl/tl_skel.c (added)
• uspace/srv/hw/netif/ne2000/Makefile (moved) (moved from uspace/srv/hw/netif/dp8390/Makefile ) (view diffs)
• uspace/srv/hw/netif/ne2000/dp8390.c (moved) (moved from uspace/srv/hw/netif/dp8390/dp8390.c ) (view diffs)
• uspace/srv/hw/netif/ne2000/dp8390.h (moved) (moved from uspace/srv/hw/netif/dp8390/dp8390.h ) (view diffs)
• uspace/srv/hw/netif/ne2000/ne2000.c (moved) (moved from uspace/srv/hw/netif/dp8390/ne2000.c ) (view diffs)
• uspace/srv/net/cfg/ne2k (modified) (view diffs)
• uspace/srv/net/il/arp/Makefile (modified) (view diffs)
• uspace/srv/net/il/arp/arp.c (modified) (view diffs)
• uspace/srv/net/il/arp/arp.h (modified) (view diffs)
• uspace/srv/net/il/arp/arp_header.h (deleted)
• uspace/srv/net/il/arp/arp_module.c (deleted)
• uspace/srv/net/il/arp/arp_module.h (deleted)
• uspace/srv/net/il/arp/arp_oc.h (deleted)
• uspace/srv/net/il/ip/Makefile (modified) (view diffs)
• uspace/srv/net/il/ip/ip.c (modified) (view diffs)
• uspace/srv/net/il/ip/ip.h (modified) (view diffs)
• uspace/srv/net/il/ip/ip_module.c (deleted)
• uspace/srv/net/il/ip/ip_module.h (deleted)
• uspace/srv/net/net/net.c (modified) (view diffs)
• uspace/srv/net/net/net.h (modified) (view diffs)
• uspace/srv/net/netif/lo/lo.c (modified) (view diffs)
• uspace/srv/net/nil/eth/Makefile (modified) (view diffs)
• uspace/srv/net/nil/eth/eth.c (modified) (view diffs)
• uspace/srv/net/nil/eth/eth.h (modified) (view diffs)
• uspace/srv/net/nil/eth/eth_header.h (deleted)
• uspace/srv/net/nil/nildummy/Makefile (modified) (view diffs)
• uspace/srv/net/nil/nildummy/nildummy.c (modified) (view diffs)
• uspace/srv/net/nil/nildummy/nildummy.h (modified) (view diffs)
• uspace/srv/net/nil/nildummy/nildummy_module.c (deleted)
• uspace/srv/net/tl/icmp/Makefile (modified) (view diffs)
• uspace/srv/net/tl/icmp/icmp.c (modified) (view diffs)
• uspace/srv/net/tl/icmp/icmp_module.c (deleted)
• uspace/srv/net/tl/icmp/icmp_module.h (deleted)
• uspace/srv/net/tl/tcp/Makefile (modified) (view diffs)
• uspace/srv/net/tl/tcp/tcp.c (modified) (view diffs)
• uspace/srv/net/tl/tcp/tcp_module.h (deleted)
• uspace/srv/net/tl/udp/Makefile (modified) (view diffs)
• uspace/srv/net/tl/udp/udp.c (modified) (view diffs)
• uspace/srv/net/tl/udp/udp_module.c (deleted)
• uspace/srv/net/tl/udp/udp_module.h (deleted)