From: Jack Lange <jacklange@cs.pitt.edu>
Date: Thu, 16 Jun 2011 16:32:46 +0000 (-0500)
Subject: Merge branch 'devel' of ssh://palacios@newskysaw/home/palacios/palacios into devel
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=commitdiff_plain;h=ee7af4a9a90b5f65c0edc2bc904aea992c4678e0

Merge branch 'devel' of ssh://palacios@newskysaw/home/palacios/palacios into devel
---

ee7af4a9a90b5f65c0edc2bc904aea992c4678e0
diff --cc linux_module/palacios-vnet.c
index b18ca90,eb7761a..7070c6d
--- a/linux_module/palacios-vnet.c
+++ b/linux_module/palacios-vnet.c
@@@ -14,8 -14,9 +14,9 @@@
  #include <linux/timer.h>
  
  #include <vnet/vnet.h>
 -#include "palacios-mm.h"
 +#include "mm.h"
  #include "palacios-vnet.h"
+ #include "linux-exts.h"
  
  static void host_print(const char *	fmt, ...) {