Ignore:
Timestamp:
2011-04-13T14:45:41Z (14 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
88634420
Parents:
cefb126 (diff), 17279ead (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.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/generic/include/console/kconsole.h

    rcefb126 r89c57b6  
    6262        size_t len;
    6363        /** Integer value. */
    64         unative_t intval;
     64        sysarg_t intval;
    6565        /** Resulting type of variable arg */
    6666        cmd_arg_type_t vartype;
Note: See TracChangeset for help on using the changeset viewer.