Start merging linux-ip-routing fork
diff --git a/mem.c b/mem.c
index 479cbbe..702c122 100644
--- a/mem.c
+++ b/mem.c
@@ -124,6 +124,9 @@
 #ifdef MAP_EXECUTABLE
 	{ MAP_EXECUTABLE,"MAP_EXECUTABLE"},
 #endif
+#ifdef MAP_INHERIT
+	{ MAP_INHERIT,"MAP_INHERIT"	},
+#endif
 #ifdef MAP_FILE
 	{ MAP_FILE,"MAP_FILE"},
 #endif