Changeset 3317724 in mainline

Timestamp:

2011-03-29T19:32:53Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

eea1dd5

Parents:

2cf95e8 (diff), 93ebe4e (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:

• HelenOS.config (modified) (view diffs)
• defaults/arm32/gta02/Makefile.config (modified) (view diffs)
• kernel/arch/arm32/src/mach/integratorcp/integratorcp.c (modified) (view diffs)
• kernel/arch/mips32/include/cp0.h (modified) (view diffs)
• kernel/arch/sparc64/src/smp/sun4v/smp.c (modified) (view diffs)
• kernel/arch/sparc64/src/sun4v/start.S (modified) (view diffs)
• kernel/arch/sparc64/src/trap/sun4v/interrupt.c (modified) (view diffs)
• kernel/genarch/Makefile.inc (modified) (view diffs)
• kernel/genarch/src/kbrd/kbrd_pl050.c (deleted)
• kernel/genarch/src/kbrd/scanc_pl050.c (deleted)
• kernel/tools/genmap.py (modified) (view diffs)
• tools/mkfat.py (modified) (view diffs)
• tools/mkhord.py (modified) (view diffs)
• tools/mktmpfs.py (modified) (view diffs)
• uspace/app/bdsh/cmds/modules/cat/cat.c (modified) (view diffs)
• uspace/app/bdsh/cmds/modules/cat/cat.h (modified) (view diffs)
• uspace/app/bdsh/cmds/modules/cp/cp.c (modified) (view diffs)
• uspace/app/bdsh/cmds/modules/rm/rm.c (modified) (view diffs)
• uspace/lib/c/generic/net/packet.c (modified) (view diffs)
• uspace/lib/c/generic/net/socket_client.c (modified) (view diffs)
• uspace/lib/c/include/adt/generic_char_map.h (modified) (view diffs)
• uspace/lib/c/include/adt/generic_field.h (modified) (view diffs)
• uspace/lib/c/include/adt/int_map.h (modified) (view diffs)
• uspace/lib/c/include/ipc/services.h (modified) (view diffs)
• uspace/lib/fs/libfs.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/srv/devman/devman.c (modified) (view diffs)
• uspace/srv/devman/main.c (modified) (view diffs)
• uspace/srv/devman/util.c (modified) (view diffs)
• uspace/srv/devman/util.h (modified) (view diffs)
• uspace/srv/hid/kbd/Makefile (modified) (view diffs)
• uspace/srv/hid/kbd/ctl/pl050.c (deleted)
• uspace/srv/hid/kbd/generic/kbd.c (modified) (view diffs)
• uspace/srv/hid/kbd/include/kbd.h (modified) (view diffs)
• uspace/srv/hid/kbd/port/ns16550.c (modified) (view diffs)
• uspace/srv/hid/kbd/port/z8530.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/net/il/arp/arp.c (modified) (view diffs)
• uspace/srv/net/il/ip/ip.c (modified) (view diffs)
• uspace/srv/net/net/net.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/udp/udp.c (modified) (view diffs)
• uspace/srv/vfs/vfs_ops.c (modified) (view diffs)
• version (modified) (view diffs)