Changeset bd5f3b7 in mainline for abi/include/sysinfo.h

Timestamp:

2011-08-21T13:07:35Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

00aece0, f1a9e87

Parents:

86a34d3e (diff), a6480d5 (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:

• abi/include/sysinfo.h (moved) (moved from kernel/generic/include/sysinfo/abi.h ) (1 diff)

abi/include/sysinfo.h

@@ -34 +34 @@
  */
 
-#ifndef KERN_ABI_H_
-#define KERN_ABI_H_
+#ifndef ABI_SYSINFO_H_
+#define ABI_SYSINFO_H_
 
 /** Number of load components */