Changeset fa76f81 in mainline for uspace/lib


Ignore:
Timestamp:
2011-11-14T08:40:44Z (14 years ago)
Author:
Frantisek Princ <frantisek.princ@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
2966122
Parents:
c2245a3 (diff), 612ad864 (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 with mainline

Location:
uspace/lib
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/drv/generic/remote_pci.c

    rc2245a3 rfa76f81  
    3232/** @file
    3333 */
     34
    3435#include <assert.h>
    3536#include <async.h>

  • uspace/lib/net/tl/tl_common.c

    rc2245a3 rfa76f81  
    158158 * @return              ENOENT if the packet dimension is not cached.
    159159 */
    160 int
    161 tl_update_ip_packet_dimension(packet_dimensions_t *packet_dimensions,
     160int tl_update_ip_packet_dimension(packet_dimensions_t *packet_dimensions,
    162161    nic_device_id_t device_id, size_t content)
    163162{
Note: See TracChangeset for help on using the changeset viewer.