From: Jack Lange <jarusl@cs.northwestern.edu>
Date: Mon, 8 Nov 2010 22:36:19 +0000 (-0600)
Subject: Merge branch 'devel' of ssh://palacios@newskysaw/home/palacios/palacios into devel
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=commitdiff_plain;h=ee8666572bea1a9628d96ebc3e4d97f84b357134;p=palacios.git

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

Conflicts:

	palacios/include/palacios/vmm.h
---

ee8666572bea1a9628d96ebc3e4d97f84b357134
diff --cc palacios/include/palacios/vmm.h
index b9c77b5,ee70107..620761a
--- a/palacios/include/palacios/vmm.h
+++ b/palacios/include/palacios/vmm.h
@@@ -216,12 -212,11 +212,15 @@@ struct guest_info
  	    thread;							\
  	})
  
- 
  #endif
  
++<<<<<<< HEAD:palacios/include/palacios/vmm.h
 +
++=======
++>>>>>>> 0956466aad020813d1e470df366d552fdabab2a9:palacios/include/palacios/vmm.h
  /* ** */
  
+ 
  #define V3_ASSERT(x)							\
      do {								\
  	extern struct v3_os_hooks * os_hooks; 				\