Changeset 694ca93f in mainline for uspace/srv

Timestamp:

2011-05-01T19:34:26Z (14 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

0e26444

Parents:

1ff896e (diff), 042fbe0 (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

Location:

uspace/srv

Files:

• bd/ata_bd/ata_bd.c (modified) (view diffs)
• bd/ata_bd/ata_hw.h (modified) (view diffs)
• bd/rd/Makefile (modified) (view diffs)
• devman/Makefile (modified) (view diffs)
• devman/devman.c (modified) (view diffs)
• devman/devman.h (modified) (view diffs)
• devman/main.c (modified) (view diffs)
• devman/util.c (modified) (view diffs)
• devman/util.h (modified) (view diffs)
• devmap/Makefile (modified) (view diffs)
• devmap/devmap.c (modified) (view diffs)
• fs/devfs/Makefile (modified) (view diffs)
• fs/fat/Makefile (modified) (view diffs)
• fs/fat/fat_fat.c (modified) (view diffs)
• fs/fat/fat_idx.c (modified) (view diffs)
• fs/fat/fat_ops.c (modified) (view diffs)
• fs/tmpfs/Makefile (modified) (view diffs)
• hid/kbd/Makefile (modified) (view diffs)
• hid/kbd/ctl/pl050.c (deleted)
• hid/kbd/generic/kbd.c (modified) (view diffs)
• hid/kbd/include/kbd.h (modified) (view diffs)
• hid/kbd/port/ns16550.c (modified) (view diffs)
• hid/kbd/port/z8530.c (modified) (view diffs)
• hw/bus/cuda_adb/cuda_adb.c (modified) (view diffs)
• hw/irc/apic/apic.c (modified) (view diffs)
• hw/irc/fhc/fhc.c (modified) (view diffs)
• hw/irc/i8259/i8259.c (modified) (view diffs)
• hw/irc/obio/obio.c (modified) (view diffs)
• hw/netif/ne2000/dp8390.c (modified) (view diffs)
• hw/netif/ne2000/ne2000.c (modified) (view diffs)
• loader/Makefile (modified) (view diffs)
• loader/arch/abs32le/Makefile.inc (deleted)
• loader/arch/abs32le/_link.ld.in (deleted)
• loader/arch/amd64/Makefile.inc (deleted)
• loader/arch/amd64/_link.ld.in (deleted)
• loader/arch/arm32/Makefile.inc (deleted)
• loader/arch/arm32/_link.ld.in (deleted)
• loader/arch/ia32/Makefile.inc (deleted)
• loader/arch/ia32/_link.ld.in (deleted)
• loader/arch/ia64/Makefile.inc (deleted)
• loader/arch/ia64/_link.ld.in (deleted)
• loader/arch/mips32/Makefile.inc (deleted)
• loader/arch/mips32/_link.ld.in (deleted)
• loader/arch/mips32eb (deleted)
• loader/arch/ppc32/Makefile.inc (deleted)
• loader/arch/ppc32/_link.ld.in (deleted)
• loader/arch/sparc64/Makefile.inc (deleted)
• loader/arch/sparc64/_link.ld.in (deleted)
• loader/elf_load.c (modified) (view diffs)
• loader/include/elf_load.h (modified) (view diffs)
• loader/main.c (modified) (view diffs)
• net/il/arp/arp.c (modified) (view diffs)
• net/il/ip/ip.c (modified) (view diffs)
• net/net/net.c (modified) (view diffs)
• net/nil/eth/eth.c (modified) (view diffs)
• net/tl/icmp/Makefile (modified) (view diffs)
• net/tl/tcp/tcp.c (modified) (view diffs)
• net/tl/tcp/tcp.h (modified) (view diffs)
• net/tl/udp/udp.c (modified) (view diffs)
• ns/Makefile (modified) (view diffs)
• ns/clonable.c (modified) (view diffs)
• ns/service.c (modified) (view diffs)
• ns/task.c (modified) (view diffs)
• vfs/Makefile (modified) (view diffs)
• vfs/vfs_file.c (modified) (view diffs)
• vfs/vfs_ops.c (modified) (view diffs)