From: Patrick G. Bridges <bridges@cs.unm.edu>
Date: Fri, 11 Nov 2011 16:52:12 +0000 (-0700)
Subject: Merge branch 'devel' of ssh://newskysaw.cs.northwestern.edu/home/palacios/palacios... 
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=commitdiff_plain;h=7f5af6dae89572f00563cde3165b87b83c3ed7e4;hp=1fc062adedda3f93f7f95395257a808c7b531fc9

Merge branch 'devel' of ssh://newskysaw.cs.northwestern.edu/home/palacios/palacios into devel
---

diff --git a/linux_module/iface-file.c b/linux_module/iface-file.c
index 5489764..1df1d6d 100644
--- a/linux_module/iface-file.c
+++ b/linux_module/iface-file.c
@@ -128,7 +128,7 @@ static int palacios_file_mkdir(const char * pathname, unsigned short perms, int
 	struct nameidata nd;
 
 	// I'm not 100% sure about the version here, but it was around this time that the API changed
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,35) 
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,37) 
 	ret = kern_path_parent(pathname, &nd);
 #else