Changeset 8cc4ddb in mainline for kernel/generic/src/sysinfo/sysinfo.c

Timestamp:

2011-08-28T21:16:54Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

0f0f8bc

Parents:

1a5b252 (diff), 36e2b55 (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:

• kernel/generic/src/sysinfo/sysinfo.c (modified) (1 diff)

kernel/generic/src/sysinfo/sysinfo.c

@@ -661 +661 @@
  *
  */
-sysarg_t sys_sysinfo_get_tag(void *path_ptr, size_t path_size)
+sysarg_t sys_sysinfo_get_val_type(void *path_ptr, size_t path_size)
 {
         /*