Changeset b77ce84 in mainline

Timestamp:

2011-04-13T17:27:52Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

34e8bab, a0a134b

Parents:

8b4ce802 (diff), 17279ead (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:

• kernel/Makefile (modified) (view diffs)
• kernel/arch/mips32/include/atomic.h (modified) (view diffs)
• kernel/generic/include/ipc/ipc.h (modified) (view diffs)
• kernel/generic/include/proc/tasklet.h (deleted)
• kernel/generic/src/ipc/sysipc.c (modified) (view diffs)
• kernel/generic/src/main/main.c (modified) (view diffs)
• kernel/generic/src/proc/tasklet.c (deleted)
• uspace/app/bdsh/cmds/modules/cat/cat.c (modified) (view diffs)
• uspace/app/trace/trace.c (modified) (view diffs)
• uspace/drv/isa/isa.c (modified) (view diffs)
• uspace/lib/c/arch/mips32/include/atomic.h (modified) (view diffs)
• uspace/lib/c/generic/adt/measured_strings.c (modified) (view diffs)
• uspace/lib/c/generic/async.c (modified) (view diffs)
• uspace/lib/c/generic/vfs/vfs.c (modified) (view diffs)
• uspace/lib/c/include/async.h (modified) (view diffs)
• uspace/lib/drv/generic/driver.c (modified) (view diffs)
• uspace/lib/net/generic/generic.c (modified) (view diffs)
• uspace/lib/net/generic/net_checksum.c (modified) (view diffs)
• uspace/lib/net/generic/packet_client.c (modified) (view diffs)
• uspace/lib/net/il/ip_client.c (modified) (view diffs)
• uspace/lib/net/tl/icmp_client.c (modified) (view diffs)
• uspace/lib/net/tl/socket_core.c (modified) (view diffs)
• uspace/lib/net/tl/tl_common.c (modified) (view diffs)
• uspace/lib/packet/generic/packet_server.c (modified) (view diffs)
• uspace/lib/softint/generic/multiplication.c (modified) (view diffs)
• uspace/srv/bd/ata_bd/ata_bd.c (modified) (view diffs)
• uspace/srv/bd/ata_bd/ata_hw.h (modified) (view diffs)
• uspace/srv/devman/devman.c (modified) (view diffs)
• uspace/srv/devman/devman.h (modified) (view diffs)
• uspace/srv/devman/main.c (modified) (view diffs)
• uspace/srv/fs/fat/fat_ops.c (modified) (view diffs)
• uspace/srv/net/il/ip/ip.c (modified) (view diffs)
• uspace/srv/net/nil/eth/eth.c (modified) (view diffs)
• uspace/srv/net/tl/tcp/tcp.c (modified) (view diffs)
• uspace/srv/net/tl/tcp/tcp.h (modified) (view diffs)
• uspace/srv/net/tl/udp/udp.c (modified) (view diffs)
• uspace/srv/vfs/vfs_file.c (modified) (view diffs)