Changeset 5828554 in mainline for contrib/arch/uspace/srv/ns/ns.adl

Timestamp:

2014-01-19T14:37:22Z (10 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

cf982ff

Parents:

2f591127 (diff), 476f62c (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:

• contrib/arch/uspace/srv/ns/ns.adl (modified) (1 diff)

contrib/arch/uspace/srv/ns/ns.adl

@@ -6 +6 @@
                 sysarg_t ipc_m_connect_me_to(in sysarg_t service, in sysarg_t arg2, in sysarg_t arg3, in sysarg_t flags);
                 
-                /* Share real-time clock page or klog page */
+                /* Share real-time clock page or kio page */
                 sysarg_t ipc_m_share_in(in sysarg_t as_area_base, in sysarg_t as_area_size, in sysarg_t service);