From: Lei Xia <lxia@northwestern.edu>
Date: Sun, 6 Feb 2011 06:51:56 +0000 (-0600)
Subject: Merge branch 'devel' of palacios@newskysaw.cs.northwestern.edu:/home/palacios/palacio... 
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=commitdiff_plain;h=5e81abea907908ab9bdc0cb57a3537f05db77b5e;p=palacios.git

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

5e81abea907908ab9bdc0cb57a3537f05db77b5e
diff --cc palacios/include/palacios/vmm_dev_mgr.h
index 2e732cd,84bbc58..1e3f68b
--- a/palacios/include/palacios/vmm_dev_mgr.h
+++ b/palacios/include/palacios/vmm_dev_mgr.h
@@@ -26,8 -26,8 +26,9 @@@
  #include <palacios/vmm_list.h>
  #include <palacios/vmm_string.h>
  #include <palacios/vmm_hashtable.h>
+ #include <palacios/vmm_msr.h>
  #include <palacios/vmm_config.h>
 +#include <palacios/vmm_ethernet.h>
  
  
  struct v3_vm_info;