Changeset ff381a7 in mainline for uspace/srv

Timestamp:

2015-11-02T20:54:19Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d8513177

Parents:

3feeab2 (diff), 5265eea4 (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:

• audio/hound/audio_sink.c (modified) (view diffs)
• audio/hound/hound.c (modified) (view diffs)
• audio/hound/hound_ctx.c (modified) (view diffs)
• audio/hound/main.c (modified) (view diffs)
• bd/file_bd/file_bd.c (modified) (view diffs)
• bd/part/guid_part/guid_part.c (modified) (view diffs)
• bd/part/mbr_part/mbr_part.c (modified) (view diffs)
• bd/rd/rd.c (modified) (view diffs)
• bd/sata_bd/sata_bd.c (modified) (view diffs)
• bd/vbd/disk.c (modified) (view diffs)
• bd/vbd/vbd.c (modified) (view diffs)
• clipboard/clipboard.c (modified) (view diffs)
• devman/client_conn.c (modified) (view diffs)
• devman/client_conn.h (modified) (view diffs)
• devman/driver.c (modified) (view diffs)
• devman/drv_conn.c (modified) (view diffs)
• devman/drv_conn.h (modified) (view diffs)
• devman/loc.c (modified) (view diffs)
• devman/main.c (modified) (view diffs)
• devman/match.c (modified) (view diffs)
• fs/cdfs/cdfs.c (modified) (view diffs)
• fs/cdfs/cdfs_ops.c (modified) (view diffs)
• fs/exfat/exfat.c (modified) (view diffs)
• fs/exfat/exfat_ops.c (modified) (view diffs)
• fs/ext4fs/Makefile (modified) (view diffs)
• fs/ext4fs/ext4fs.c (modified) (view diffs)
• fs/fat/fat.c (modified) (view diffs)
• fs/fat/fat_ops.c (modified) (view diffs)
• fs/locfs/locfs.c (modified) (view diffs)
• fs/locfs/locfs_ops.c (modified) (view diffs)
• fs/mfs/mfs.c (modified) (view diffs)
• fs/mfs/mfs_ops.c (modified) (view diffs)
• fs/tmpfs/tmpfs.c (modified) (view diffs)
• fs/tmpfs/tmpfs_dump.c (modified) (view diffs)
• fs/udf/udf.c (modified) (view diffs)
• fs/udf/udf_ops.c (modified) (view diffs)
• hid/compositor/compositor.c (modified) (view diffs)
• hid/console/console.c (modified) (view diffs)
• hid/input/ctl/kbdev.c (modified) (view diffs)
• hid/input/input.c (modified) (view diffs)
• hid/input/port/adb.c (modified) (view diffs)
• hid/input/port/adb_mouse.c (modified) (view diffs)
• hid/input/port/chardev.c (modified) (view diffs)
• hid/input/proto/mousedev.c (modified) (view diffs)
• hid/isdv4_tablet/main.c (modified) (view diffs)
• hid/output/output.c (modified) (view diffs)
• hid/remcons/remcons.c (modified) (view diffs)
• hid/rfb/main.c (modified) (view diffs)
• hid/s3c24xx_ts/s3c24xx_ts.c (modified) (view diffs)
• hw/bus/cuda_adb/cuda_adb.c (modified) (view diffs)
• hw/char/s3c24xx_uart/s3c24xx_uart.c (modified) (view diffs)
• hw/irc/apic/apic.c (modified) (view diffs)
• hw/irc/i8259/i8259.c (modified) (view diffs)
• hw/irc/icp-ic/icp-ic.c (modified) (view diffs)
• hw/irc/obio/obio.c (modified) (view diffs)
• loader/main.c (modified) (view diffs)
• locsrv/locsrv.c (modified) (view diffs)
• locsrv/locsrv.h (modified) (view diffs)
• logger/main.c (modified) (view diffs)
• net/dhcp/main.c (modified) (view diffs)
• net/dnsrsrv/dnsrsrv.c (modified) (view diffs)
• net/ethip/ethip.c (modified) (view diffs)
• net/ethip/ethip_nic.c (modified) (view diffs)
• net/inetsrv/addrobj.c (modified) (view diffs)
• net/inetsrv/inet_link.c (modified) (view diffs)
• net/inetsrv/inetsrv.c (modified) (view diffs)
• net/loopip/loopip.c (modified) (view diffs)
• net/nconfsrv/nconfsrv.c (modified) (view diffs)
• net/slip/slip.c (modified) (view diffs)
• net/tcp/conn.c (modified) (view diffs)
• net/tcp/service.c (modified) (view diffs)
• net/tcp/tcp_type.h (modified) (view diffs)
• net/udp/service.c (modified) (view diffs)
• net/udp/udp_type.h (modified) (view diffs)
• ns/clonable.c (modified) (view diffs)
• ns/clonable.h (modified) (view diffs)
• ns/ns.c (modified) (view diffs)
• ns/service.c (modified) (view diffs)
• ns/service.h (modified) (view diffs)
• ns/task.c (modified) (view diffs)
• taskmon/taskmon.c (modified) (view diffs)
• vfs/vfs.c (modified) (view diffs)
• vfs/vfs.h (modified) (view diffs)
• vfs/vfs_ops.c (modified) (view diffs)
• vfs/vfs_register.c (modified) (view diffs)
• volsrv/empty.c (modified) (view diffs)
• volsrv/volsrv.c (modified) (view diffs)