Changeset bdae198 in mainline

Timestamp:

2013-08-04T12:01:10Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

ea509069

Parents:

b08879c2 (diff), d856110 (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/arch/arm32/src/mach/beaglebone/beaglebone.c (modified) (view diffs)
• kernel/genarch/src/drivers/am335x/timer.c (modified) (view diffs)
• uspace/app/bdsh/cmds/modules/cat/cat.c (modified) (view diffs)
• uspace/app/dnsres/dnsres.c (modified) (view diffs)
• uspace/app/mkmfs/mkmfs.c (modified) (view diffs)
• uspace/app/netecho/netecho.c (modified) (view diffs)
• uspace/app/nettest1/nettest.c (modified) (view diffs)
• uspace/app/nettest1/nettest.h (modified) (view diffs)
• uspace/app/nettest1/nettest1.c (modified) (view diffs)
• uspace/app/nettest2/nettest2.c (modified) (view diffs)
• uspace/app/nettest3/nettest3.c (modified) (view diffs)
• uspace/app/nterm/conn.c (modified) (view diffs)
• uspace/app/ping/ping.c (modified) (view diffs)
• uspace/app/ping6/ping6.c (modified) (view diffs)
• uspace/drv/block/ata_bd/main.c (modified) (view diffs)
• uspace/drv/char/ns8250/ns8250.c (modified) (view diffs)
• uspace/lib/c/generic/dnsr.c (modified) (view diffs)
• uspace/lib/c/generic/inet/addr.c (modified) (view diffs)
• uspace/lib/c/generic/inetping6.c (modified) (view diffs)
• uspace/lib/c/generic/iplink.c (modified) (view diffs)
• uspace/lib/c/generic/iplink_srv.c (modified) (view diffs)
• uspace/lib/c/generic/net/socket_parse.c (modified) (view diffs)
• uspace/lib/c/include/inet/addr.h (modified) (view diffs)
• uspace/lib/c/include/inet/dnsr.h (modified) (view diffs)
• uspace/lib/c/include/inet/iplink.h (modified) (view diffs)
• uspace/lib/c/include/inet/iplink_srv.h (modified) (view diffs)
• uspace/lib/c/include/ipc/iplink.h (modified) (view diffs)
• uspace/lib/posix/include/posix/stdio.h (modified) (view diffs)
• uspace/lib/posix/include/posix/stdlib.h (modified) (view diffs)
• uspace/lib/posix/include/posix/unistd.h (modified) (view diffs)
• uspace/lib/posix/source/stdlib.c (modified) (view diffs)
• uspace/lib/posix/source/unistd.c (modified) (view diffs)
• uspace/srv/net/dnsrsrv/dns_msg.c (modified) (view diffs)
• uspace/srv/net/dnsrsrv/dns_msg.h (modified) (view diffs)
• uspace/srv/net/dnsrsrv/dns_std.h (modified) (view diffs)
• uspace/srv/net/dnsrsrv/dnsrsrv.c (modified) (view diffs)
• uspace/srv/net/dnsrsrv/query.c (modified) (view diffs)
• uspace/srv/net/dnsrsrv/query.h (modified) (view diffs)
• uspace/srv/net/ethip/ethip.c (modified) (view diffs)
• uspace/srv/net/ethip/ethip.h (modified) (view diffs)
• uspace/srv/net/ethip/ethip_nic.c (modified) (view diffs)
• uspace/srv/net/ethip/pdu.c (modified) (view diffs)
• uspace/srv/net/inetsrv/Makefile (modified) (view diffs)
• uspace/srv/net/inetsrv/addrobj.c (modified) (view diffs)
• uspace/srv/net/inetsrv/icmp.c (modified) (view diffs)
• uspace/srv/net/inetsrv/icmpv6.c (modified) (view diffs)
• uspace/srv/net/inetsrv/icmpv6_std.h (modified) (view diffs)
• uspace/srv/net/inetsrv/inet_link.c (modified) (view diffs)
• uspace/srv/net/inetsrv/inet_link.h (modified) (view diffs)
• uspace/srv/net/inetsrv/inet_std.h (modified) (view diffs)
• uspace/srv/net/inetsrv/inetping6.c (modified) (view diffs)
• uspace/srv/net/inetsrv/inetsrv.c (modified) (view diffs)
• uspace/srv/net/inetsrv/inetsrv.h (modified) (view diffs)
• uspace/srv/net/inetsrv/ndp.c (added)
• uspace/srv/net/inetsrv/ndp.h (added)
• uspace/srv/net/inetsrv/ntrans.c (added)
• uspace/srv/net/inetsrv/ntrans.h (added)
• uspace/srv/net/inetsrv/pdu.c (modified) (view diffs)
• uspace/srv/net/inetsrv/pdu.h (modified) (view diffs)
• uspace/srv/net/inetsrv/reass.c (modified) (view diffs)
• uspace/srv/net/loopip/loopip.c (modified) (view diffs)
• uspace/srv/net/slip/slip.c (modified) (view diffs)
• uspace/srv/net/tcp/conn.c (modified) (view diffs)
• uspace/srv/net/tcp/pdu.c (modified) (view diffs)
• uspace/srv/net/tcp/sock.c (modified) (view diffs)
• uspace/srv/net/tcp/std.h (modified) (view diffs)
• uspace/srv/net/tcp/tcp.c (modified) (view diffs)
• uspace/srv/net/tcp/tqueue.c (modified) (view diffs)
• uspace/srv/net/tcp/ucall.c (modified) (view diffs)
• uspace/srv/net/udp/assoc.c (modified) (view diffs)
• uspace/srv/net/udp/pdu.c (modified) (view diffs)
• uspace/srv/net/udp/sock.c (modified) (view diffs)
• uspace/srv/net/udp/std.h (modified) (view diffs)