Changeset 3842a955 in mainline

Timestamp:

2011-06-19T15:59:42Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

26e7d6d

Parents:

9724d7f (diff), 74464e8 (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/generic/include/adt/list.h (modified) (view diffs)
• kernel/generic/src/adt/hash_table.c (modified) (view diffs)
• kernel/generic/src/adt/list.c (modified) (view diffs)
• uspace/app/edit/sheet.c (modified) (view diffs)
• uspace/app/edit/sheet.h (modified) (view diffs)
• uspace/app/sbi/src/compat.h (modified) (view diffs)
• uspace/app/sbi/src/list_t.h (modified) (view diffs)
• uspace/app/tester/mm/common.c (modified) (view diffs)
• uspace/app/usbinfo/dump.c (modified) (view diffs)
• uspace/app/usbinfo/hid.c (modified) (view diffs)
• uspace/drv/ohci/endpoint_list.c (modified) (view diffs)
• uspace/drv/ohci/endpoint_list.h (modified) (view diffs)
• uspace/drv/ohci/hc.c (modified) (view diffs)
• uspace/drv/ohci/hc.h (modified) (view diffs)
• uspace/drv/uhci/hc.c (modified) (view diffs)
• uspace/drv/uhci/transfer_list.c (modified) (view diffs)
• uspace/drv/uhci/transfer_list.h (modified) (view diffs)
• uspace/drv/usbmid/explore.c (modified) (view diffs)
• uspace/drv/vhc/transfer.c (modified) (view diffs)
• uspace/drv/vhc/vhcd.h (modified) (view diffs)
• uspace/lib/block/libblock.c (modified) (view diffs)
• uspace/lib/c/generic/adt/hash_table.c (modified) (view diffs)
• uspace/lib/c/generic/adt/list.c (modified) (view diffs)
• uspace/lib/c/generic/adt/prodcons.c (modified) (view diffs)
• uspace/lib/c/generic/async.c (modified) (view diffs)
• uspace/lib/c/generic/devman.c (modified) (view diffs)
• uspace/lib/c/generic/fibril.c (modified) (view diffs)
• uspace/lib/c/generic/fibril_synch.c (modified) (view diffs)
• uspace/lib/c/generic/io/io.c (modified) (view diffs)
• uspace/lib/c/generic/ipc.c (modified) (view diffs)
• uspace/lib/c/include/adt/hash_table.h (modified) (view diffs)
• uspace/lib/c/include/adt/list.h (modified) (view diffs)
• uspace/lib/c/include/adt/prodcons.h (modified) (view diffs)
• uspace/lib/c/include/async.h (modified) (view diffs)
• uspace/lib/c/include/fibril_synch.h (modified) (view diffs)
• uspace/lib/c/include/ipc/devman.h (modified) (view diffs)
• uspace/lib/drv/generic/driver.c (modified) (view diffs)
• uspace/lib/drv/include/ddf/interrupt.h (modified) (view diffs)
• uspace/lib/usbhid/include/usb/hid/hiddescriptor.h (modified) (view diffs)
• uspace/lib/usbhid/include/usb/hid/hidpath.h (modified) (view diffs)
• uspace/lib/usbhid/include/usb/hid/hidtypes.h (modified) (view diffs)
• uspace/lib/usbhid/src/hiddescriptor.c (modified) (view diffs)
• uspace/lib/usbhid/src/hidparser.c (modified) (view diffs)
• uspace/lib/usbhid/src/hidpath.c (modified) (view diffs)
• uspace/srv/devman/devman.c (modified) (view diffs)
• uspace/srv/devman/devman.h (modified) (view diffs)
• uspace/srv/devman/match.c (modified) (view diffs)
• uspace/srv/devmap/devmap.c (modified) (view diffs)
• uspace/srv/fs/ext2fs/ext2fs_ops.c (modified) (view diffs)
• uspace/srv/fs/fat/fat_idx.c (modified) (view diffs)
• uspace/srv/fs/fat/fat_ops.c (modified) (view diffs)
• uspace/srv/fs/tmpfs/tmpfs.h (modified) (view diffs)
• uspace/srv/fs/tmpfs/tmpfs_ops.c (modified) (view diffs)
• uspace/srv/hid/input/generic/input.c (modified) (view diffs)
• uspace/srv/hid/input/include/input.h (modified) (view diffs)
• uspace/srv/hw/netif/ne2000/dp8390.c (modified) (view diffs)
• uspace/srv/hw/netif/ne2000/dp8390.h (modified) (view diffs)
• uspace/srv/hw/netif/ne2000/ne2000.c (modified) (view diffs)
• uspace/srv/ns/clonable.c (modified) (view diffs)
• uspace/srv/ns/service.c (modified) (view diffs)
• uspace/srv/ns/task.c (modified) (view diffs)
• uspace/srv/vfs/vfs.h (modified) (view diffs)
• uspace/srv/vfs/vfs_lookup.c (modified) (view diffs)
• uspace/srv/vfs/vfs_ops.c (modified) (view diffs)
• uspace/srv/vfs/vfs_register.c (modified) (view diffs)