Changeset 9f4067b6 in mainline

Timestamp:

2012-10-09T21:16:13Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

6659037, 7d248e3

Parents:

d1ef4a1 (diff), 97b199b1 (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 from lp:~jakub/helenos/gsoc2012-uspace-hash-table-from-adam.

Location:

uspace

Files:

• app/mkexfat/mkexfat.c (modified) (view diffs)
• app/trace/ipcp.c (modified) (view diffs)
• app/trace/proto.c (modified) (view diffs)
• app/trace/proto.h (modified) (view diffs)
• lib/block/block.c (modified) (view diffs)
• lib/block/block.h (modified) (view diffs)
• lib/c/Makefile (modified) (view diffs)
• lib/c/generic/adt/hash_set.c (deleted)
• lib/c/generic/adt/hash_table.c (modified) (view diffs)
• lib/c/generic/async.c (modified) (view diffs)
• lib/c/include/adt/hash.h (added)
• lib/c/include/adt/hash_set.h (deleted)
• lib/c/include/adt/hash_table.h (modified) (view diffs)
• lib/c/include/adt/list.h (modified) (view diffs)
• lib/c/include/macros.h (modified) (view diffs)
• lib/nic/include/nic.h (modified) (view diffs)
• lib/nic/include/nic_addr_db.h (modified) (view diffs)
• lib/nic/include/nic_wol_virtues.h (modified) (view diffs)
• lib/nic/src/nic_addr_db.c (modified) (view diffs)
• lib/nic/src/nic_wol_virtues.c (modified) (view diffs)
• srv/devman/devman.c (modified) (view diffs)
• srv/devman/devman.h (modified) (view diffs)
• srv/fs/cdfs/cdfs_ops.c (modified) (view diffs)
• srv/fs/exfat/exfat.h (modified) (view diffs)
• srv/fs/exfat/exfat_idx.c (modified) (view diffs)
• srv/fs/exfat/exfat_ops.c (modified) (view diffs)
• srv/fs/ext2fs/ext2fs_ops.c (modified) (view diffs)
• srv/fs/ext4fs/ext4fs_ops.c (modified) (view diffs)
• srv/fs/fat/fat.h (modified) (view diffs)
• srv/fs/fat/fat_idx.c (modified) (view diffs)
• srv/fs/locfs/locfs_ops.c (modified) (view diffs)
• srv/fs/mfs/mfs.h (modified) (view diffs)
• srv/fs/mfs/mfs_ops.c (modified) (view diffs)
• srv/fs/tmpfs/tmpfs.h (modified) (view diffs)
• srv/fs/tmpfs/tmpfs_ops.c (modified) (view diffs)
• srv/fs/udf/udf.h (modified) (view diffs)
• srv/fs/udf/udf_idx.c (modified) (view diffs)
• srv/hid/input/gsp.c (modified) (view diffs)
• srv/hid/input/gsp.h (modified) (view diffs)
• srv/ns/service.c (modified) (view diffs)
• srv/ns/task.c (modified) (view diffs)
• srv/vfs/vfs.h (modified) (view diffs)
• srv/vfs/vfs_node.c (modified) (view diffs)