Changeset 2b96463 in mainline

Timestamp:

2011-01-28T15:15:11Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

3ee48f2, 7a51d75

Parents:

ef8d655 (diff), ae0300b5 (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/debug.h (modified) (view diffs)
• kernel/generic/include/ipc/ipc.h (modified) (view diffs)
• kernel/generic/include/proc/thread.h (modified) (view diffs)
• kernel/generic/src/console/cmd.c (modified) (view diffs)
• kernel/generic/src/ipc/ipc.c (modified) (view diffs)
• kernel/generic/src/ipc/sysipc.c (modified) (view diffs)
• kernel/generic/src/proc/scheduler.c (modified) (view diffs)
• kernel/generic/src/proc/task.c (modified) (view diffs)
• kernel/generic/src/proc/thread.c (modified) (view diffs)
• kernel/generic/src/synch/waitq.c (modified) (view diffs)
• uspace/Makefile (modified) (view diffs)
• uspace/app/stats/stats.c (modified) (view diffs)
• uspace/app/tasks/Makefile (deleted)
• uspace/app/tasks/tasks.c (deleted)
• uspace/app/top/screen.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/devmap.c (modified) (view diffs)
• uspace/lib/c/generic/ipc.c (modified) (view diffs)
• uspace/lib/c/generic/net/modules.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/c/include/ipc/ipc.h (modified) (view diffs)
• uspace/lib/fs/libfs.c (modified) (view diffs)
• uspace/lib/net/il/il_skel.c (modified) (view diffs)
• uspace/lib/net/nil/nil_skel.c (modified) (view diffs)
• uspace/lib/net/tl/tl_skel.c (modified) (view diffs)
• uspace/lib/usbvirt/src/main.c (modified) (view diffs)
• uspace/srv/clip/clip.c (modified) (view diffs)
• uspace/srv/devman/main.c (modified) (view diffs)
• uspace/srv/devmap/devmap.c (modified) (view diffs)
• uspace/srv/hid/adb_mouse/adb_dev.c (modified) (view diffs)
• uspace/srv/hid/char_mouse/chardev.c (modified) (view diffs)
• uspace/srv/hid/console/console.c (modified) (view diffs)
• uspace/srv/hid/fb/main.c (modified) (view diffs)
• uspace/srv/hid/kbd/port/adb.c (modified) (view diffs)
• uspace/srv/hid/kbd/port/chardev.c (modified) (view diffs)
• uspace/srv/hw/irc/apic/apic.c (modified) (view diffs)
• uspace/srv/hw/irc/fhc/fhc.c (modified) (view diffs)
• uspace/srv/hw/irc/i8259/i8259.c (modified) (view diffs)
• uspace/srv/hw/irc/obio/obio.c (modified) (view diffs)
• uspace/srv/hw/netif/ne2000/ne2000.c (modified) (view diffs)
• uspace/srv/loader/main.c (modified) (view diffs)
• uspace/srv/net/net/net.c (modified) (view diffs)
• uspace/srv/net/netif/lo/lo.c (modified) (view diffs)
• uspace/srv/vfs/vfs.c (modified) (view diffs)
• uspace/srv/vfs/vfs.h (modified) (view diffs)
• uspace/srv/vfs/vfs_file.c (modified) (view diffs)
• uspace/srv/vfs/vfs_ops.c (modified) (view diffs)